| Index: Source/core/css/CSSDefaultStyleSheets.cpp
|
| diff --git a/Source/core/css/CSSDefaultStyleSheets.cpp b/Source/core/css/CSSDefaultStyleSheets.cpp
|
| index d334c18373cdc361bce82936383acd81f3522835..8db72a45574d36b5199a08cae816c203b8d7d5ff 100644
|
| --- a/Source/core/css/CSSDefaultStyleSheets.cpp
|
| +++ b/Source/core/css/CSSDefaultStyleSheets.cpp
|
| @@ -99,11 +99,11 @@ CSSDefaultStyleSheets::CSSDefaultStyleSheets()
|
| m_defaultQuirksStyle = RuleSet::create();
|
|
|
| // Strict-mode rules.
|
| - String defaultRules = String(htmlUserAgentStyleSheet, sizeof(htmlUserAgentStyleSheet)) + RenderTheme::theme().extraDefaultStyleSheet();
|
| + String defaultRules = String(htmlCss, sizeof(htmlCss)) + RenderTheme::theme().extraDefaultStyleSheet();
|
| m_defaultStyleSheet = parseUASheet(defaultRules);
|
| m_defaultStyle->addRulesFromSheet(defaultStyleSheet(), screenEval());
|
| #if OS(ANDROID)
|
| - String viewportRules(viewportAndroidUserAgentStyleSheet, sizeof(viewportAndroidUserAgentStyleSheet));
|
| + String viewportRules(viewportAndroidCss, sizeof(viewportAndroidCss));
|
| #else
|
| String viewportRules;
|
| #endif
|
| @@ -112,7 +112,7 @@ CSSDefaultStyleSheets::CSSDefaultStyleSheets()
|
| m_defaultPrintStyle->addRulesFromSheet(defaultStyleSheet(), printEval());
|
|
|
| // Quirks-mode rules.
|
| - String quirksRules = String(quirksUserAgentStyleSheet, sizeof(quirksUserAgentStyleSheet)) + RenderTheme::theme().extraQuirksStyleSheet();
|
| + String quirksRules = String(quirksCss, sizeof(quirksCss)) + RenderTheme::theme().extraQuirksStyleSheet();
|
| m_quirksStyleSheet = parseUASheet(quirksRules);
|
| m_defaultQuirksStyle->addRulesFromSheet(quirksStyleSheet(), screenEval());
|
| }
|
| @@ -122,7 +122,7 @@ RuleSet* CSSDefaultStyleSheets::defaultViewSourceStyle()
|
| if (!m_defaultViewSourceStyle) {
|
| m_defaultViewSourceStyle = RuleSet::create();
|
| // Loaded stylesheet is leaked on purpose.
|
| - RefPtrWillBeRawPtr<StyleSheetContents> stylesheet = parseUASheet(sourceUserAgentStyleSheet, sizeof(sourceUserAgentStyleSheet));
|
| + RefPtrWillBeRawPtr<StyleSheetContents> stylesheet = parseUASheet(viewSourceCss, sizeof(viewSourceCss));
|
| m_defaultViewSourceStyle->addRulesFromSheet(stylesheet.release().leakRef(), screenEval());
|
| }
|
| return m_defaultViewSourceStyle.get();
|
| @@ -133,7 +133,7 @@ RuleSet* CSSDefaultStyleSheets::defaultTransitionStyle()
|
| if (!m_defaultTransitionStyle) {
|
| m_defaultTransitionStyle = RuleSet::create();
|
| // Loaded stylesheet is leaked on purpose.
|
| - RefPtrWillBeRawPtr<StyleSheetContents> stylesheet = parseUASheet(navigationTransitionsUserAgentStyleSheet, sizeof(navigationTransitionsUserAgentStyleSheet));
|
| + RefPtrWillBeRawPtr<StyleSheetContents> stylesheet = parseUASheet(navigationTransitionsCss, sizeof(navigationTransitionsCss));
|
| m_defaultTransitionStyle->addRulesFromSheet(stylesheet.release().leakRef(), screenEval());
|
| }
|
| return m_defaultTransitionStyle.get();
|
| @@ -144,7 +144,7 @@ RuleSet* CSSDefaultStyleSheets::defaultXHTMLMobileProfileStyle()
|
| if (!m_defaultXHTMLMobileProfileStyle) {
|
| m_defaultXHTMLMobileProfileStyle = RuleSet::create();
|
| // Loaded stylesheet is leaked on purpose.
|
| - RefPtrWillBeRawPtr<StyleSheetContents> stylesheet = parseUASheet(xhtmlmpUserAgentStyleSheet, sizeof(xhtmlmpUserAgentStyleSheet));
|
| + RefPtrWillBeRawPtr<StyleSheetContents> stylesheet = parseUASheet(xhtmlmpCss, sizeof(xhtmlmpCss));
|
| m_defaultXHTMLMobileProfileStyle->addRulesFromSheet(stylesheet.release().leakRef(), screenEval());
|
| }
|
| return m_defaultXHTMLMobileProfileStyle.get();
|
| @@ -154,7 +154,7 @@ void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(Element* element,
|
| {
|
| // FIXME: We should assert that the sheet only styles SVG elements.
|
| if (element->isSVGElement() && !m_svgStyleSheet) {
|
| - m_svgStyleSheet = parseUASheet(svgUserAgentStyleSheet, sizeof(svgUserAgentStyleSheet));
|
| + m_svgStyleSheet = parseUASheet(svgCss, sizeof(svgCss));
|
| m_defaultStyle->addRulesFromSheet(svgStyleSheet(), screenEval());
|
| m_defaultPrintStyle->addRulesFromSheet(svgStyleSheet(), printEval());
|
| changedDefaultStyle = true;
|
| @@ -163,8 +163,7 @@ void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(Element* element,
|
| // FIXME: We should assert that the sheet only styles MathML elements.
|
| if (element->namespaceURI() == MathMLNames::mathmlNamespaceURI
|
| && !m_mathmlStyleSheet) {
|
| - m_mathmlStyleSheet = parseUASheet(mathmlUserAgentStyleSheet,
|
| - sizeof(mathmlUserAgentStyleSheet));
|
| + m_mathmlStyleSheet = parseUASheet(mathmlCss, sizeof(mathmlCss));
|
| m_defaultStyle->addRulesFromSheet(mathmlStyleSheet(), screenEval());
|
| m_defaultPrintStyle->addRulesFromSheet(mathmlStyleSheet(), printEval());
|
| changedDefaultStyle = true;
|
| @@ -172,7 +171,7 @@ void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(Element* element,
|
|
|
| // FIXME: We should assert that this sheet only contains rules for <video> and <audio>.
|
| if (!m_mediaControlsStyleSheet && (isHTMLVideoElement(*element) || isHTMLAudioElement(*element))) {
|
| - String mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(mediaControlsUserAgentStyleSheet)) + RenderTheme::theme().extraMediaControlsStyleSheet();
|
| + String mediaRules = String(mediaControlsCss, sizeof(mediaControlsCss)) + RenderTheme::theme().extraMediaControlsStyleSheet();
|
| m_mediaControlsStyleSheet = parseUASheet(mediaRules);
|
| m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval());
|
| m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(), printEval());
|
| @@ -182,7 +181,7 @@ void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(Element* element,
|
| // FIXME: This only works because we Force recalc the entire document so the new sheet
|
| // is loaded for <html> and the correct styles apply to everyone.
|
| if (!m_fullscreenStyleSheet && FullscreenElementStack::isFullScreen(element->document())) {
|
| - String fullscreenRules = String(fullscreenUserAgentStyleSheet, sizeof(fullscreenUserAgentStyleSheet)) + RenderTheme::theme().extraFullScreenStyleSheet();
|
| + String fullscreenRules = String(fullscreenCss, sizeof(fullscreenCss)) + RenderTheme::theme().extraFullScreenStyleSheet();
|
| m_fullscreenStyleSheet = parseUASheet(fullscreenRules);
|
| m_defaultStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval());
|
| m_defaultQuirksStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval());
|
|
|