Separate @viewport from other RuleSet construction.

third_party/WebKit/Source/core/dom/StyleEngine.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 39 matching lines @@
 namespace blink {
 
 class CSSFontSelector;
 class CSSStyleSheet;
 class Node;
 class RuleFeatureSet;
 class ShadowTreeStyleSheetCollection;
 class StyleRuleFontFace;
 class StyleSheet;
 class StyleSheetContents;
+class ViewportStyleResolver;
 
 class CORE_EXPORT StyleEngine final
     : public GarbageCollectedFinalized<StyleEngine>,
       public CSSFontSelectorClient {
   USING_GARBAGE_COLLECTED_MIXIN(StyleEngine);
 
  public:
   class IgnoringPendingStylesheet {
     DISALLOW_NEW();
 
@@ skipping 22 matching lines @@
   CSSStyleSheet* inspectorStyleSheet() const { return m_inspectorStyleSheet; }
 
   const HeapVector<Member<CSSStyleSheet>> activeStyleSheetsForInspector() const;
 
   void setNeedsActiveStyleUpdate(StyleSheet*, StyleResolverUpdateMode);
   void addStyleSheetCandidateNode(Node&);
   void removeStyleSheetCandidateNode(Node&);
   void removeStyleSheetCandidateNode(Node&, TreeScope&);
   void modifiedStyleSheetCandidateNode(Node&);
   void watchedSelectorsChanged();
+  void initialViewportChanged();
 
   void injectAuthorSheet(StyleSheetContents* authorSheet);
   CSSStyleSheet& ensureInspectorStyleSheet();
 
   void clearMediaQueryRuleSetStyleSheets();
   void updateStyleSheetsInImport(DocumentStyleSheetCollector& parentCollector);
   void updateActiveStyleSheets(StyleResolverUpdateMode);
+  void updateViewport() { documentStyleSheetCollection().updateViewport(); }
 
   enum ActiveSheetsUpdate { DontUpdateActiveSheets, UpdateActiveSheets };
   String preferredStylesheetSetName() const {
     return m_preferredStylesheetSetName;
   }
   String selectedStylesheetSetName() const {
     return m_selectedStylesheetSetName;
   }
   void setPreferredStylesheetSetNameIfNotSet(const String&, ActiveSheetsUpdate);
   void setSelectedStylesheetSetName(const String&);
@@ skipping 34 matching lines @@
   void didRemoveShadowRoot(ShadowRoot*);
   void shadowRootRemovedFromDocument(ShadowRoot*);
   void appendActiveAuthorStyleSheets();
 
   StyleResolver* resolver() const { return m_resolver.get(); }
 
   StyleResolver& ensureResolver() {
     if (!m_resolver) {
       createResolver();
     } else if (m_resolver->hasPendingAuthorStyleSheets()) {
+      updateViewport();
       m_resolver->appendPendingAuthorStyleSheets();
     }
     return *m_resolver.get();
   }
 
   bool hasResolver() const { return m_resolver.get(); }
   void clearResolver();
   void clearMasterResolver();
 
   StyleInvalidator& styleInvalidator() { return m_styleInvalidator; }
 
   CSSFontSelector* fontSelector() { return m_fontSelector.get(); }
   void setFontSelector(CSSFontSelector*);
 
   void removeFontFaceRules(const HeapVector<Member<const StyleRuleFontFace>>&);
   void clearFontCache();
   // updateGenericFontFamilySettings is used from WebSettingsImpl.
   void updateGenericFontFamilySettings();
 
+  ViewportStyleResolver& ensureViewportStyleResolver();
+
   void didDetach();
   bool shouldClearResolver() const;
   void resolverChanged(StyleResolverUpdateMode);
 
   CSSStyleSheet* createSheet(Element&,
                              const String& text,
                              TextPosition startPosition,
                              StyleEngineContext&);
 
   void collectScopedStyleFeaturesTo(RuleFeatureSet&) const;
@@ skipping 113 matching lines @@
   bool m_usesSiblingRules = false;
   bool m_usesFirstLineRules = false;
   bool m_usesWindowInactiveSelector = false;
   bool m_usesRemUnits = false;
   unsigned m_maxDirectAdjacentSelectors = 0;
 
   bool m_ignorePendingStylesheets = false;
   bool m_didCalculateResolver = false;
 
   Member<StyleResolver> m_resolver;
+  Member<ViewportStyleResolver> m_viewportResolver;
   StyleInvalidator m_styleInvalidator;
 
   Member<CSSFontSelector> m_fontSelector;
 
   HeapHashMap<AtomicString, WeakMember<StyleSheetContents>> m_textToSheetCache;
   HeapHashMap<WeakMember<StyleSheetContents>, AtomicString> m_sheetToTextCache;
 
   std::unique_ptr<StyleResolverStats> m_styleResolverStats;
   unsigned m_styleForElementCount = 0;
 
   friend class StyleEngineTest;
 };
 
 }  // namespace blink
 
 #endif