Current work-in-progress crbug.com/567021

third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h

Index: third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h
diff --git a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h
index 8c4e183a468b85f03d4958705b8831e10c3a1daa..472caa16afec8d23a2c5ae9048d8c72804ebd6e4 100644
--- a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h
+++ b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h
@@ -37,18 +37,18 @@ class CSSDefaultStyleSheets : public GarbageCollected<CSSDefaultStyleSheets> {
 public:
     static CSSDefaultStyleSheets& instance();
 
-    void ensureDefaultStyleSheetsForElement(const Element&, bool& changedDefaultStyle);
-    void ensureDefaultStyleSheetForFullscreen();
+    bool ensureDefaultStyleSheetsForElement(const Element&);
+    bool ensureDefaultStyleSheetForFullscreen();
 
     RuleSet* defaultStyle() { return m_defaultStyle.get(); }
     RuleSet* defaultQuirksStyle() { return m_defaultQuirksStyle.get(); }
     RuleSet* defaultPrintStyle() { return m_defaultPrintStyle.get(); }
     RuleSet* defaultViewSourceStyle();
-    RuleSet* defaultMobileViewportStyle();
-    RuleSet* defaultTelevisionViewportStyle();
 
+    StyleSheetContents* ensureMobileViewportStyleSheet();
+    StyleSheetContents* ensureTelevisionViewportStyleSheet();
     // FIXME: Remove WAP support.
-    RuleSet* defaultXHTMLMobileProfileStyle();
+    StyleSheetContents* ensureXHTMLMobileProfileStyleSheet();
 
     StyleSheetContents* defaultStyleSheet() { return m_defaultStyleSheet.get(); }
     StyleSheetContents* quirksStyleSheet() { return m_quirksStyleSheet.get(); }
@@ -63,16 +63,14 @@ private:
     CSSDefaultStyleSheets();
 
     Member<RuleSet> m_defaultStyle;
-    Member<RuleSet> m_defaultMobileViewportStyle;
-    Member<RuleSet> m_defaultTelevisionViewportStyle;
     Member<RuleSet> m_defaultQuirksStyle;
     Member<RuleSet> m_defaultPrintStyle;
     Member<RuleSet> m_defaultViewSourceStyle;
-    Member<RuleSet> m_defaultXHTMLMobileProfileStyle;
 
     Member<StyleSheetContents> m_defaultStyleSheet;
     Member<StyleSheetContents> m_mobileViewportStyleSheet;
     Member<StyleSheetContents> m_televisionViewportStyleSheet;
+    Member<StyleSheetContents> m_xhtmlMobileProfileStyleSheet;
     Member<StyleSheetContents> m_quirksStyleSheet;
     Member<StyleSheetContents> m_svgStyleSheet;
     Member<StyleSheetContents> m_mathmlStyleSheet;