Chromium Code Reviews| Index: Source/core/css/CSSDefaultStyleSheets.cpp |
| diff --git a/Source/core/css/CSSDefaultStyleSheets.cpp b/Source/core/css/CSSDefaultStyleSheets.cpp |
| index 1137f9b7ad9e1e93161d9ffdc12b3b9d47ce58ae..09b9660df1ece610e6ad9860acd9642b8d7276b2 100644 |
| --- a/Source/core/css/CSSDefaultStyleSheets.cpp |
| +++ b/Source/core/css/CSSDefaultStyleSheets.cpp |
| @@ -104,11 +104,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(); |
|
haraken
2014/07/01 00:47:46
htmlCss => htmlCSS
The same comment for other par
tkent
2014/07/01 00:52:49
This is the existing naming rule of make-file-arra
|
| 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 |
| @@ -117,7 +117,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()); |
| } |
| @@ -127,7 +127,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(); |
| @@ -138,7 +138,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(); |
| @@ -149,7 +149,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(); |
| @@ -159,7 +159,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; |
| @@ -168,8 +168,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; |
| @@ -177,7 +176,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()); |
| @@ -187,7 +186,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()); |