Introduce markAllTreeScopesDirty.

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

 /*
  * 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, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 237 matching lines @@
 }
 
 void StyleEngine::watchedSelectorsChanged() {
   m_globalRuleSet.initWatchedSelectorsRuleSet(document());
   // TODO(rune@opera.com): Should be able to use RuleSetInvalidation here.
   document().setNeedsStyleRecalc(SubtreeStyleChange,
                                  StyleChangeReasonForTracing::create(
                                      StyleChangeReason::DeclarativeContent));
 }
 
-bool StyleEngine::shouldUpdateDocumentStyleSheetCollection(
-    StyleResolverUpdateMode updateMode) const {
-  return m_documentScopeDirty || updateMode == FullStyleUpdate;
+bool StyleEngine::shouldUpdateDocumentStyleSheetCollection() const {
+  return m_allTreeScopesDirty || m_documentScopeDirty;
 }
 
-bool StyleEngine::shouldUpdateShadowTreeStyleSheetCollection(
-    StyleResolverUpdateMode updateMode) const {
-  return !m_dirtyTreeScopes.isEmpty() || updateMode == FullStyleUpdate;
+bool StyleEngine::shouldUpdateShadowTreeStyleSheetCollection() const {
+  return m_allTreeScopesDirty || !m_dirtyTreeScopes.isEmpty();
 }
 
 void StyleEngine::mediaQueryAffectingValueChanged(
     UnorderedTreeScopeSet& treeScopes) {
   for (TreeScope* treeScope : treeScopes) {
     DCHECK(treeScope != m_document);
     ShadowTreeStyleSheetCollection* collection =
         toShadowTreeStyleSheetCollection(styleSheetCollectionFor(*treeScope));
     DCHECK(collection);
     collection->clearMediaQueryRuleSetStyleSheets();
@@ skipping 37 matching lines @@
 
 void StyleEngine::updateActiveStyleSheets(StyleResolverUpdateMode updateMode) {
   DCHECK(isMaster());
   DCHECK(!document().inStyleRecalc());
 
   if (!document().isActive())
     return;
 
   TRACE_EVENT0("blink,blink_style", "StyleEngine::updateActiveStyleSheets");
 
-  if (shouldUpdateDocumentStyleSheetCollection(updateMode))
+  if (shouldUpdateDocumentStyleSheetCollection())
     documentStyleSheetCollection().updateActiveStyleSheets(*this, updateMode);
 
-  if (shouldUpdateShadowTreeStyleSheetCollection(updateMode)) {
+  if (shouldUpdateShadowTreeStyleSheetCollection()) {
     UnorderedTreeScopeSet treeScopesRemoved;
 
-    if (updateMode == FullStyleUpdate) {
+    if (m_allTreeScopesDirty) {
       for (TreeScope* treeScope : m_activeTreeScopes)
         updateActiveStyleSheetsInShadow(updateMode, treeScope,
                                         treeScopesRemoved);
     } else {
       for (TreeScope* treeScope : m_dirtyTreeScopes)
         updateActiveStyleSheetsInShadow(updateMode, treeScope,
                                         treeScopesRemoved);
     }
     for (TreeScope* treeScope : treeScopesRemoved)
       m_activeTreeScopes.remove(treeScope);
   }
 
   InspectorInstrumentation::activeStyleSheetsUpdated(m_document);
 
   m_dirtyTreeScopes.clear();
   m_documentScopeDirty = false;
+  m_allTreeScopesDirty = false;
 }
 
 void StyleEngine::updateActiveStyleSheets() {
   // TODO(rune@opera.com): collect ActiveStyleSheets here.
 }
 
 void StyleEngine::updateViewport() {
   if (m_viewportResolver)
     m_viewportResolver->updateViewport(documentStyleSheetCollection());
 }
@@ skipping 164 matching lines @@
     return;
   }
 
   // Don't bother updating, since we haven't loaded all our style info yet
   // and haven't calculated the style selector for the first time.
   if (!document().isActive() || shouldClearResolver()) {
     clearResolver();
     return;
   }
 
+  if (mode == FullStyleUpdate)
+    markAllTreeScopesDirty();
   m_didCalculateResolver = true;
   updateActiveStyleSheets(mode);
 }
 
 void StyleEngine::clearFontCache() {
   if (m_fontSelector)
     m_fontSelector->fontFaceCache()->clearCSSConnected();
   if (m_resolver)
     m_resolver->invalidateMatchedPropertiesCache();
 }
@@ skipping 690 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(StyleEngine) {
   for (auto sheet : m_injectedAuthorStyleSheets) {
     visitor->traceWrappers(sheet);
   }
   visitor->traceWrappers(m_documentStyleSheetCollection);
 }
 
 }  // namespace blink