Index: Source/core/css/CSSDefaultStyleSheets.cpp |
diff --git a/Source/core/css/CSSDefaultStyleSheets.cpp b/Source/core/css/CSSDefaultStyleSheets.cpp |
index 2799cff8102e4db8d3a137031ed4ba169ac11eae..ecfdeb3e4966ec8e7537ad3ec7484085525dccf3 100644 |
--- a/Source/core/css/CSSDefaultStyleSheets.cpp |
+++ b/Source/core/css/CSSDefaultStyleSheets.cpp |
@@ -33,6 +33,7 @@ |
#include "core/css/MediaQueryEvaluator.h" |
#include "core/css/RuleSet.h" |
#include "core/css/StyleSheetContents.h" |
+#include "core/css/ViewportStyle.h" |
#include "core/dom/FullscreenElementStack.h" |
#include "core/html/HTMLAnchorElement.h" |
#include "core/html/HTMLHtmlElement.h" |
@@ -57,7 +58,7 @@ StyleSheetContents* CSSDefaultStyleSheets::mediaControlsStyleSheet; |
StyleSheetContents* CSSDefaultStyleSheets::fullscreenStyleSheet; |
// FIXME: It would be nice to use some mechanism that guarantees this is in sync with the real UA stylesheet. |
-static const char simpleUserAgentStyleSheet[] = "html,body,div{display:block}head{display:none}body{margin:8px}div:focus,span:focus,a:focus{outline:auto 5px -webkit-focus-ring-color}a:-webkit-any-link{color:-webkit-link;text-decoration:underline}a:-webkit-any-link:active{color:-webkit-activelink}body:-webkit-seamless-document{margin:0}body:-webkit-full-page-media{background-color:black}@viewport{min-width:980px}@page{size:auto;margin:auto;padding:0;border-width:0}"; |
+static const char simpleUserAgentStyleSheet[] = "html,body,div{display:block}head{display:none}body{margin:8px}div:focus,span:focus,a:focus{outline:auto 5px -webkit-focus-ring-color}a:-webkit-any-link{color:-webkit-link;text-decoration:underline}a:-webkit-any-link:active{color:-webkit-activelink}body:-webkit-seamless-document{margin:0}body:-webkit-full-page-media{background-color:black}@page{size:auto;margin:auto;padding:0;border-width:0}"; |
static inline bool elementCanUseSimpleDefaultStyle(Element* e) |
{ |
@@ -119,6 +120,7 @@ void CSSDefaultStyleSheets::loadFullDefaultStyle() |
String defaultRules = String(htmlUserAgentStyleSheet, sizeof(htmlUserAgentStyleSheet)) + RenderTheme::theme().extraDefaultStyleSheet(); |
defaultStyleSheet = parseUASheet(defaultRules); |
defaultStyle->addRulesFromSheet(defaultStyleSheet, screenEval()); |
+ defaultStyle->addRulesFromSheet(parseUASheet(ViewportStyle::viewportStyleSheet()), screenEval()); |
rune
2013/11/02 13:48:59
Since you removed the @viewport from the simple de
bokan
2013/11/04 21:35:34
Done.
|
defaultPrintStyle->addRulesFromSheet(defaultStyleSheet, printEval()); |
// Quirks-mode rules. |