Remove checkForChildrenAdjacentRuleChanges.

third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/invalidation/StyleInvalidator.h"
 
 #include "core/css/invalidation/InvalidationSet.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/ElementTraversal.h"
@@ skipping 159 matching lines @@
         const SiblingInvalidationSet& invalidationSet = *m_invalidationEntries[index].m_invalidationSet;
         ++index;
         if (!invalidationSet.invalidatesElement(element))
             continue;
 
         if (invalidationSet.invalidatesSelf())
             thisElementNeedsStyleRecalc = true;
 
         if (const DescendantInvalidationSet* descendants = invalidationSet.siblingDescendants()) {
             if (descendants->wholeSubtreeInvalid()) {
-                // Avoid directly setting SubtreeStyleChange on element, or ContainerNode::checkForChildrenAdjacentRuleChanges()
-                // may propagate the SubtreeStyleChange to our own siblings' subtrees.
-
-                for (Element* child = ElementTraversal::firstChild(element); child; child = ElementTraversal::nextSibling(*child)) {
-                    child->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::SiblingSelector));
-                }
+                element.setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::StyleInvalidator));
                 return true;
             }
 
             if (!descendants->isEmpty())
                 recursionData.pushInvalidationSet(*descendants);
         }
 
     }
     return thisElementNeedsStyleRecalc;
 }
 
 void StyleInvalidator::pushInvalidationSetsForElement(Element& element, RecursionData& recursionData, SiblingData& siblingData)
 {
     PendingInvalidations* pendingInvalidations = m_pendingInvalidationMap.get(&element);
     ASSERT(pendingInvalidations);
 
     for (const auto& invalidationSet : pendingInvalidations->siblings())
         siblingData.pushInvalidationSet(toSiblingInvalidationSet(*invalidationSet));
 
+    if (element.styleChangeType() >= SubtreeStyleChange)
+        return;
+
     if (!pendingInvalidations->descendants().isEmpty()) {
         for (const auto& invalidationSet : pendingInvalidations->descendants())
             recursionData.pushInvalidationSet(toDescendantInvalidationSet(*invalidationSet));
         if (UNLIKELY(*s_tracingEnabled)) {
             TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"),
                 "StyleInvalidatorInvalidationTracking",
                 TRACE_EVENT_SCOPE_THREAD,
                 "data", InspectorStyleInvalidatorInvalidateEvent::invalidationList(element, pendingInvalidations->descendants()));
         }
     }
 }
 
 ALWAYS_INLINE bool StyleInvalidator::checkInvalidationSetsAgainstElement(Element& element, RecursionData& recursionData, SiblingData& siblingData)
 {
-    if (element.styleChangeType() >= SubtreeStyleChange || recursionData.wholeSubtreeInvalid()) {
+    if (recursionData.wholeSubtreeInvalid())
+        return false;
+
+    bool thisElementNeedsStyleRecalc = false;
+    if (element.styleChangeType() >= SubtreeStyleChange) {
         recursionData.setWholeSubtreeInvalid();
-        return false;
+    } else {
+        thisElementNeedsStyleRecalc = recursionData.matchesCurrentInvalidationSets(element);
+        if (UNLIKELY(!siblingData.isEmpty()))
+            thisElementNeedsStyleRecalc |= siblingData.matchCurrentInvalidationSets(element, recursionData);
     }
 
-    bool thisElementNeedsStyleRecalc = recursionData.matchesCurrentInvalidationSets(element);
-    if (UNLIKELY(!siblingData.isEmpty()))
-        thisElementNeedsStyleRecalc |= siblingData.matchCurrentInvalidationSets(element, recursionData);
-
     if (UNLIKELY(element.needsStyleInvalidation()))
         pushInvalidationSetsForElement(element, recursionData, siblingData);
+
     return thisElementNeedsStyleRecalc;
 }
 
 bool StyleInvalidator::invalidateShadowRootChildren(Element& element, RecursionData& recursionData)
 {
     bool someChildrenNeedStyleRecalc = false;
     for (ShadowRoot* root = element.youngestShadowRoot(); root; root = root->olderShadowRoot()) {
         if (!recursionData.treeBoundaryCrossing() && !root->childNeedsStyleInvalidation() && !root->needsStyleInvalidation())
             continue;
         SiblingData siblingData;
@@ skipping 56 matching lines @@
 }
 
 DEFINE_TRACE(StyleInvalidator)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_pendingInvalidationMap);
 #endif
 }
 
 } // namespace blink