Make updateStyleAndLayoutTree ready for async stylesheet update.

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 83 matching lines @@
   styleSheetsForStyleSheetList(TreeScope&);
 
   const HeapVector<TraceWrapperMember<CSSStyleSheet>>&
   injectedAuthorStyleSheets() const {
     return m_injectedAuthorStyleSheets;
   }
   CSSStyleSheet* inspectorStyleSheet() const { return m_inspectorStyleSheet; }
 
   const HeapVector<Member<CSSStyleSheet>> activeStyleSheetsForInspector() const;
 
+  bool needsActiveStyleUpdate() const;
   void setNeedsActiveStyleUpdate(StyleSheet*, StyleResolverUpdateMode);
   void addStyleSheetCandidateNode(Node&);
   void removeStyleSheetCandidateNode(Node&);
   void removeStyleSheetCandidateNode(Node&, TreeScope&);
   void modifiedStyleSheetCandidateNode(Node&);
   void watchedSelectorsChanged();
   void initialViewportChanged();
   void viewportRulesChanged();
 
   void injectAuthorSheet(StyleSheetContents* authorSheet);
   CSSStyleSheet& ensureInspectorStyleSheet();
   RuleSet* watchedSelectorsRuleSet() {
     return m_globalRuleSet.watchedSelectorsRuleSet();
   }
 
   void clearMediaQueryRuleSetStyleSheets();
   void updateStyleSheetsInImport(DocumentStyleSheetCollector& parentCollector);
   void updateActiveStyleSheets(StyleResolverUpdateMode);
+  void updateActiveStyle();
 
   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 38 matching lines @@
   const DocumentOrderedList& treeBoundaryCrossingScopes() const {
     return m_treeBoundaryCrossingScopes;
   }
   void resetAuthorStyle(TreeScope&);
 
   StyleResolver* resolver() const { return m_resolver; }
 
   void setRuleUsageTracker(StyleRuleUsageTracker*);
 
   StyleResolver& ensureResolver() {
+    updateActiveStyle();
     if (!m_resolver) {
       createResolver();
     } else if (m_resolver->hasPendingAuthorStyleSheets()) {
-      viewportRulesChanged();
       m_resolver->appendPendingAuthorStyleSheets();
       finishAppendAuthorStyleSheets();
     } else if (m_globalRuleSet.isDirty()) {
       m_globalRuleSet.update(document());
     }
     return *m_resolver;
   }
 
   bool hasResolver() const { return m_resolver; }
   void clearResolver();
@@ skipping 110 matching lines @@
       StyleResolverUpdateMode,
       TreeScope*,
       UnorderedTreeScopeSet& treeScopesRemoved);
 
   bool shouldSkipInvalidationFor(const Element&) const;
   void scheduleRuleSetInvalidationsForElement(
       Element&,
       const HeapVector<Member<RuleSet>>&);
   void invalidateSlottedElements(HTMLSlotElement&);
 
+  void updateViewport();
+  void updateActiveStyleSheets();
+
   Member<Document> m_document;
   bool m_isMaster;
 
   // Track the number of currently loading top-level stylesheets needed for
   // layout.  Sheets loaded using the @import directive are not included in this
   // count.  We use this count of pending sheets to detect when we can begin
   // attaching elements and when it is safe to execute scripts.
   int m_pendingScriptBlockingStylesheets = 0;
   int m_pendingRenderBlockingStylesheets = 0;
 
@@ skipping 35 matching lines @@
 
   std::unique_ptr<StyleResolverStats> m_styleResolverStats;
   unsigned m_styleForElementCount = 0;
 
   friend class StyleEngineTest;
 };
 
 }  // namespace blink
 
 #endif