Skip child ShadowRoots when invalidation does not have boundary crossing rules

Source/core/css/RuleFeature.cpp

Index: Source/core/css/RuleFeature.cpp
diff --git a/Source/core/css/RuleFeature.cpp b/Source/core/css/RuleFeature.cpp
index 6adb2dc6fcfdb6c2da48c0f0d9dc3528d7449be8..ddb81a42f4dec05fc46e82f258132cd54f9811e4 100644
--- a/Source/core/css/RuleFeature.cpp
+++ b/Source/core/css/RuleFeature.cpp
@@ -207,20 +207,14 @@ RuleFeatureSet::InvalidationSetMode RuleFeatureSet::updateInvalidationSets(const
         return mode;
 
     InvalidationSetFeatures features;
-    const CSSSelector* current = extractInvalidationSetFeatures(selector, features);
-    if (current) {
-        bool wholeSubtree = current->relation() == CSSSelector::DirectAdjacent || current->relation() == CSSSelector::IndirectAdjacent;
-        current = current->tagHistory();
-        if (current)
-            addFeaturesToInvalidationSets(*current, features, wholeSubtree);
-    }
+    if (const CSSSelector* current = extractInvalidationSetFeatures(selector, features))
+        addFeaturesToInvalidationSets(*current, features);
     return AddFeatures;
 }
 
 const CSSSelector* RuleFeatureSet::extractInvalidationSetFeatures(const CSSSelector& selector, InvalidationSetFeatures& features)
 {
-    const CSSSelector* lastSelector = &selector;
-    for (; lastSelector; lastSelector = lastSelector->tagHistory()) {
+    for (const CSSSelector* lastSelector = &selector;; lastSelector; lastSelector = lastSelector->tagHistory()) {

[rune, 2014/05/30 21:02:45]

The double ;; is what gave you compile problems, I suppose.

Oh. Fixed in next patch set.

         extractInvalidationSetFeature(*lastSelector, features);
         // Initialize the entry in the invalidation set map, if supported.
         invalidationSetForSelector(*lastSelector);
@@ -231,17 +225,32 @@ const CSSSelector* RuleFeatureSet::extractInvalidationSetFeatures(const CSSSelec
             }
         }
 
-        if (lastSelector->relation() != CSSSelector::SubSelector)
-            break;
+        switch (current->relation()) {
+        case CSSSelector::SubSelector:
+            continue;
+        case CSSSelector::ShadowPseudo:
+        case CSSSelector::ShadowDeep:
+            features.treeBoundaryCrossing = true;
+            return lastSelector->tagHistory();
+        case CSSSelector::DirectAdjacent:
+        case CSSSelector::IndirectAdjacent:
+            features.wholeSubtree = true;
+            return lastSelector->tagHistory();
+        case CSSSelector::Descendant:
+        case CSSSelector::Child:
+            return lastSelector->tagHistory();
+        }
     }
-    return lastSelector;
+    return 0;
 }
 
-void RuleFeatureSet::addFeaturesToInvalidationSets(const CSSSelector& selector, const InvalidationSetFeatures& features, bool wholeSubtree)
+void RuleFeatureSet::addFeaturesToInvalidationSets(const CSSSelector& selector, InvalidationSetFeatures& features)
 {
     for (const CSSSelector* current = &selector; current; current = current->tagHistory()) {
         if (DescendantInvalidationSet* invalidationSet = invalidationSetForSelector(*current)) {
-            if (wholeSubtree) {
+            if (features.treeBoundaryCrossing)
+                invalidationSet->setTreeBoundaryCrossing();
+            if (features.wholeSubtree) {
                 invalidationSet->setWholeSubtreeInvalid();
             } else {
                 if (!features.id.isEmpty())
@@ -256,27 +265,28 @@ void RuleFeatureSet::addFeaturesToInvalidationSets(const CSSSelector& selector,
                     invalidationSet->setCustomPseudoInvalid();
             }
         } else if (current->pseudoType() == CSSSelector::PseudoHost || current->pseudoType() == CSSSelector::PseudoAny) {
+            if (current->pseudoType() == CSSSelector::PseudoHost)
+                features.treeBoundaryCrossing = true;
             if (const CSSSelectorList* selectorList = current->selectorList()) {
                 for (const CSSSelector* selector = selectorList->first(); selector; selector = CSSSelectorList::next(*selector))
-                    addFeaturesToInvalidationSets(*selector, features, wholeSubtree);
+                    addFeaturesToInvalidationSets(*selector, features);
             }
         }
         switch (current->relation()) {
-        case CSSSelector::Descendant:
-        case CSSSelector::Child:
+        case CSSSelector::SubSelector:
+            break;
         case CSSSelector::ShadowPseudo:
         case CSSSelector::ShadowDeep:
-            wholeSubtree = false;
+            features.treeBoundaryCrossing = true;
+            features.wholeSubtree = false;
+            break;
+        case CSSSelector::Descendant:
+        case CSSSelector::Child:
+            features.wholeSubtree = false;
             break;
         case CSSSelector::DirectAdjacent:
         case CSSSelector::IndirectAdjacent:
-            wholeSubtree = true;
-            break;
-        case CSSSelector::SubSelector:
-            break;
-        default:
-            // All combinators should be handled above.
-            ASSERT_NOT_REACHED();
+            features.wholeSubtree = true;
             break;
         }
     }