Remove ensureResolver before invalidation set scheduling.

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 171 matching lines @@
   DCHECK_GT(m_pendingScriptBlockingStylesheets, 0);
 
   m_pendingScriptBlockingStylesheets--;
   if (m_pendingScriptBlockingStylesheets)
     return;
 
   document().didRemoveAllPendingStylesheet();
 }
 
 void StyleEngine::setNeedsActiveStyleUpdate(TreeScope& treeScope) {
-  if (!document().isActive() && isMaster())
-    return;
-
-  markTreeScopeDirty(treeScope);
+  if (document().isActive() || !isMaster())
+    markTreeScopeDirty(treeScope);
 }
 
 void StyleEngine::addStyleSheetCandidateNode(Node& node) {
   if (!node.isConnected() || document().isDetached())
     return;
 
   DCHECK(!isXSLStyleSheet(node));
   TreeScope& treeScope = node.treeScope();
   TreeScopeStyleSheetCollection* collection =
       ensureStyleSheetCollectionFor(treeScope);
@@ skipping 417 matching lines @@
     return true;
   return element.parentNode()->getStyleChangeType() >= SubtreeStyleChange;
 }
 
 void StyleEngine::classChangedForElement(const SpaceSplitString& changedClasses,
                                          Element& element) {
   if (shouldSkipInvalidationFor(element))
     return;
   InvalidationLists invalidationLists;
   unsigned changedSize = changedClasses.size();
-  // TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
-  // updates are async. https://crbug.com/567021
-  ensureResolver();
   const RuleFeatureSet& features = ruleFeatureSet();
   for (unsigned i = 0; i < changedSize; ++i) {
     features.collectInvalidationSetsForClass(invalidationLists, element,
                                              changedClasses[i]);
   }
   m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists,
                                                      element);
 }
 
 void StyleEngine::classChangedForElement(const SpaceSplitString& oldClasses,
                                          const SpaceSplitString& newClasses,
                                          Element& element) {
   if (shouldSkipInvalidationFor(element))
     return;
 
   if (!oldClasses.size()) {
     classChangedForElement(newClasses, element);
     return;
   }
 
   // Class vectors tend to be very short. This is faster than using a hash
   // table.
   BitVector remainingClassBits;
   remainingClassBits.ensureSize(oldClasses.size());
 
   InvalidationLists invalidationLists;
-  // TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
-  // updates are async. https://crbug.com/567021
-  ensureResolver();
   const RuleFeatureSet& features = ruleFeatureSet();
 
   for (unsigned i = 0; i < newClasses.size(); ++i) {
     bool found = false;
     for (unsigned j = 0; j < oldClasses.size(); ++j) {
       if (newClasses[i] == oldClasses[j]) {
         // Mark each class that is still in the newClasses so we can skip doing
         // an n^2 search below when looking for removals. We can't break from
         // this loop early since a class can appear more than once.
         remainingClassBits.quickSet(j);
@@ skipping 18 matching lines @@
   m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists,
                                                      element);
 }
 
 void StyleEngine::attributeChangedForElement(const QualifiedName& attributeName,
                                              Element& element) {
   if (shouldSkipInvalidationFor(element))
     return;
 
   InvalidationLists invalidationLists;
-  // TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
-  // updates are async. https://crbug.com/567021
-  ensureResolver();
   ruleFeatureSet().collectInvalidationSetsForAttribute(invalidationLists,
                                                        element, attributeName);
   m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists,
                                                      element);
 }
 
 void StyleEngine::idChangedForElement(const AtomicString& oldId,
                                       const AtomicString& newId,
                                       Element& element) {
   if (shouldSkipInvalidationFor(element))
     return;
 
   InvalidationLists invalidationLists;
-  // TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
-  // updates are async. https://crbug.com/567021
-  ensureResolver();
   const RuleFeatureSet& features = ruleFeatureSet();
   if (!oldId.isEmpty())
     features.collectInvalidationSetsForId(invalidationLists, element, oldId);
   if (!newId.isEmpty())
     features.collectInvalidationSetsForId(invalidationLists, element, newId);
   m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists,
                                                      element);
 }
 
 void StyleEngine::pseudoStateChangedForElement(
     CSSSelector::PseudoType pseudoType,
     Element& element) {
   if (shouldSkipInvalidationFor(element))
     return;
 
   InvalidationLists invalidationLists;
-  // TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
-  // updates are async. https://crbug.com/567021
-  ensureResolver();
   ruleFeatureSet().collectInvalidationSetsForPseudoClass(invalidationLists,
                                                          element, pseudoType);
   m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists,
                                                      element);
 }
 
 void StyleEngine::scheduleSiblingInvalidationsForElement(
     Element& element,
     ContainerNode& schedulingParent,
     unsigned minDirectAdjacent) {
   DCHECK(minDirectAdjacent);
 
   InvalidationLists invalidationLists;
 
-  // TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
-  // updates are async. https://crbug.com/567021
-  ensureResolver();
   const RuleFeatureSet& features = ruleFeatureSet();
 
   if (element.hasID()) {
     features.collectSiblingInvalidationSetForId(invalidationLists, element,
                                                 element.idForStyleResolution(),
                                                 minDirectAdjacent);
   }
 
   if (element.hasClass()) {
     const SpaceSplitString& classNames = element.classNames();
@@ skipping 49 matching lines @@
   scheduleSiblingInvalidationsForElement(removedElement, *schedulingParent, 1);
 
   for (unsigned i = 1; beforeElement && i <= affectedSiblings;
        i++, beforeElement = ElementTraversal::previousSibling(*beforeElement))
     scheduleSiblingInvalidationsForElement(*beforeElement, *schedulingParent,
                                            i);
 }
 
 void StyleEngine::scheduleNthPseudoInvalidations(ContainerNode& nthParent) {
   InvalidationLists invalidationLists;
-  // TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
-  // updates are async. https://crbug.com/567021
-  ensureResolver();
   ruleFeatureSet().collectNthInvalidationSet(invalidationLists);
   m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists,
                                                      nthParent);
 }
 
 void StyleEngine::scheduleRuleSetInvalidationsForElement(
     Element& element,
     const HeapHashSet<Member<RuleSet>>& ruleSets) {
   AtomicString id;
   const SpaceSplitString* classNames = nullptr;
@@ skipping 337 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(StyleEngine) {
   for (auto sheet : m_injectedAuthorStyleSheets) {
     visitor->traceWrappers(sheet);
   }
   visitor->traceWrappers(m_documentStyleSheetCollection);
 }
 
 }  // namespace blink