Use invalidation sets when selector contains adjacent combinators.

Source/core/css/RuleFeature.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 116 matching lines @@
             return foundDescendantRelation ? UseLocalStyleChange : UseSubtreeStyleChange;
         }
         switch (component->relation()) {
         case CSSSelector::Descendant:
         case CSSSelector::Child:
         case CSSSelector::ShadowPseudo:
         case CSSSelector::ShadowDeep:
             foundDescendantRelation = true;
             // Fall through!
         case CSSSelector::SubSelector:
+        case CSSSelector::DirectAdjacent:
+        case CSSSelector::IndirectAdjacent:
             continue;
         default:
+            // All combinators should be handled above.
+            ASSERT_NOT_REACHED();
             return UseLocalStyleChange;
         }
     }
     return foundIdent ? AddFeatures : UseLocalStyleChange;
 }
 
 void RuleFeatureSet::extractInvalidationSetFeature(const CSSSelector& selector, InvalidationSetFeatures& features)
 {
     if (selector.m_match == CSSSelector::Tag)
         features.tagName = selector.tagQName().localName();
@@ skipping 24 matching lines @@
 }
 
 RuleFeatureSet::InvalidationSetMode RuleFeatureSet::updateInvalidationSets(const CSSSelector& selector)
 {
     InvalidationSetMode mode = invalidationSetModeForSelector(selector);
     if (mode != AddFeatures)
         return mode;
 
     InvalidationSetFeatures features;
     const CSSSelector* current = extractInvalidationSetFeatures(selector, features);
-    if (current)
+    if (current) {
+        bool wholeSubtree = current->relation() == CSSSelector::DirectAdjacent || current->relation() == CSSSelector::IndirectAdjacent;

[esprehn, 2014/04/03 22:58:05]

It would be nicer to merge this check into the addFeaturesToInvalidationSets
loop. If the loop was:

const CSSSelector* current = &selector;
while (current && current->tagHistory()) {
  switch (current->relation()) {
    // checks for wholeSubtree or not.
  }
  if (DescendantInvalidationSet* invalidationSet =
invalidationSetForSelector(*current)) {
    // ...
  }
}

I think that would work.

[rune, 2014/04/04 09:29:37]

The problem with that is that there is no previous selector to pick the
relation() from to set the wholeSubtree value in the case of selectorList(). I
call addFeaturesToInvalidationSets() recursively for selectorList() and the
wholeSubtree input in that case is for the last combinator that is not
SubSelector, not from the previous CSSSelector.

         current = current->tagHistory();
-
-    if (current)
-        addFeaturesToInvalidationSets(*current, features);
+        if (current)
+            addFeaturesToInvalidationSets(*current, features, wholeSubtree);
+    }
     return AddFeatures;
 }
 
 const CSSSelector* RuleFeatureSet::extractInvalidationSetFeatures(const CSSSelector& selector, InvalidationSetFeatures& features)
 {
     const CSSSelector* lastSelector = &selector;
     for (; lastSelector; lastSelector = lastSelector->tagHistory()) {
         extractInvalidationSetFeature(*lastSelector, features);
         // Initialize the entry in the invalidation set map, if supported.
         invalidationSetForSelector(*lastSelector);
         if (lastSelector->pseudoType() == CSSSelector::PseudoHost || lastSelector->pseudoType() == CSSSelector::PseudoAny) {
             if (const CSSSelectorList* selectorList = lastSelector->selectorList()) {
                 for (const CSSSelector* selector = selectorList->first(); selector; selector = CSSSelectorList::next(*selector))
                     extractInvalidationSetFeatures(*selector, features);
             }
         }
 
         if (lastSelector->relation() != CSSSelector::SubSelector)
             break;
     }
     return lastSelector;
 }
 
-void RuleFeatureSet::addFeaturesToInvalidationSets(const CSSSelector& selector, const InvalidationSetFeatures& features)
+void RuleFeatureSet::addFeaturesToInvalidationSets(const CSSSelector& selector, const InvalidationSetFeatures& features, bool wholeSubtree)
 {
     for (const CSSSelector* current = &selector; current; current = current->tagHistory()) {
         if (DescendantInvalidationSet* invalidationSet = invalidationSetForSelector(*current)) {
-            if (!features.id.isEmpty())
-                invalidationSet->addId(features.id);
-            if (!features.tagName.isEmpty())
-                invalidationSet->addTagName(features.tagName);
-            for (Vector<AtomicString>::const_iterator it = features.classes.begin(); it != features.classes.end(); ++it)
-                invalidationSet->addClass(*it);
-            for (Vector<AtomicString>::const_iterator it = features.attributes.begin(); it != features.attributes.end(); ++it)
-                invalidationSet->addAttribute(*it);
-            if (features.customPseudoElement)
-                invalidationSet->setCustomPseudoInvalid();
+            if (wholeSubtree) {
+                invalidationSet->setWholeSubtreeInvalid();
+            } else {
+                if (!features.id.isEmpty())
+                    invalidationSet->addId(features.id);
+                if (!features.tagName.isEmpty())
+                    invalidationSet->addTagName(features.tagName);
+                for (Vector<AtomicString>::const_iterator it = features.classes.begin(); it != features.classes.end(); ++it)
+                    invalidationSet->addClass(*it);
+                for (Vector<AtomicString>::const_iterator it = features.attributes.begin(); it != features.attributes.end(); ++it)
+                    invalidationSet->addAttribute(*it);
+                if (features.customPseudoElement)
+                    invalidationSet->setCustomPseudoInvalid();
+            }
         } else if (current->pseudoType() == CSSSelector::PseudoHost || current->pseudoType() == CSSSelector::PseudoAny) {
             if (const CSSSelectorList* selectorList = current->selectorList()) {
                 for (const CSSSelector* selector = selectorList->first(); selector; selector = CSSSelectorList::next(*selector))
-                    addFeaturesToInvalidationSets(*selector, features);
+                    addFeaturesToInvalidationSets(*selector, features, wholeSubtree);
             }
         }
+        switch (current->relation()) {
+        case CSSSelector::Descendant:
+        case CSSSelector::Child:
+        case CSSSelector::ShadowPseudo:
+        case CSSSelector::ShadowDeep:
+            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();
+            break;
+        }
     }
 }
 
 void RuleFeatureSet::addContentAttr(const AtomicString& attributeName)
 {
     DescendantInvalidationSet& invalidationSet = ensureAttributeInvalidationSet(attributeName);
     invalidationSet.setWholeSubtreeInvalid();
 }
 
 void RuleFeatureSet::collectFeaturesFromRuleData(const RuleData& ruleData)
@@ skipping 185 matching lines @@
     if (RefPtr<DescendantInvalidationSet> invalidationSet = m_classInvalidationSets.get(className))
         m_styleInvalidator.scheduleInvalidation(invalidationSet, element);
 }
 
 StyleInvalidator& RuleFeatureSet::styleInvalidator()
 {
     return m_styleInvalidator;
 }
 
 } // namespace WebCore