Rename wholeSubtree to adjacent.

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 245 matching lines @@
             extractInvalidationSetFeature(*current, features);
         // Initialize the entry in the invalidation set map, if supported.
         invalidationSetForSelector(*current);
         if (current->pseudoType() == CSSSelector::PseudoHost || current->pseudoType() == CSSSelector::PseudoAny || current->pseudoType() == CSSSelector::PseudoNot) {
             if (const CSSSelectorList* selectorList = current->selectorList()) {
                 for (const CSSSelector* selector = selectorList->first(); selector; selector = CSSSelectorList::next(*selector))
                     extractInvalidationSetFeatures(*selector, features, current->pseudoType() == CSSSelector::PseudoNot);
             }
         }
 
-        switch (current->relation()) {
-        case CSSSelector::SubSelector:
-            break;
-        case CSSSelector::ShadowPseudo:
-        case CSSSelector::ShadowDeep:
+        if (current->relation() == CSSSelector::SubSelector)
+            continue;
+
+        if (current->isShadowSelector())
             features.treeBoundaryCrossing = true;

[chrishtr, 2014/10/10 16:26:02]

Can be written as:

features.treeBundaryCrossing = current->isShadowSelector();

just like the below.

[rune, 2014/10/10 20:00:35]

Done.

-            return current->tagHistory();
-        case CSSSelector::DirectAdjacent:
-        case CSSSelector::IndirectAdjacent:
-            features.wholeSubtree = true;
-            return current->tagHistory();
-        case CSSSelector::Descendant:
-        case CSSSelector::Child:
-            return current->tagHistory();
-        }
+
+        features.adjacent = current->isAdjacentSelector();
+        return current->tagHistory();

[Mike West, 2014/10/08 12:24:00]

This is a huge improvement in readability. Kudos.

     }
     return 0;
 }
 
 // Add features extracted from the rightmost compound selector to descendant invalidation
 // sets for features found in other compound selectors.
 //
 // Style invalidation is currently supported for descendants only, not for sibling subtrees.
 // We use wholeSubtree invalidation for features found left of adjacent combinators as
 // SubtreeStyleChange will force sibling subtree recalc in
 // ContainerNode::checkForChildrenAdjacentRuleChanges.
 //
 // As we encounter a descendant type of combinator, the features only need to be checked
-// against descendants in the same subtree only. Hence wholeSubtree is reset to false.
+// against descendants in the same subtree only. features.adjacent is set to false, and
+// we start adding features instead of calling setWholeSubtreeInvalid.
 
 void RuleFeatureSet::addFeaturesToInvalidationSets(const CSSSelector& selector, InvalidationSetFeatures& features)
 {
     for (const CSSSelector* current = &selector; current; current = current->tagHistory()) {
         if (DescendantInvalidationSet* invalidationSet = invalidationSetForSelector(*current)) {
             if (features.treeBoundaryCrossing)
                 invalidationSet->setTreeBoundaryCrossing();
-            if (features.wholeSubtree) {
+            if (features.adjacent) {
                 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)
                 features.treeBoundaryCrossing = true;
             if (const CSSSelectorList* selectorList = current->selectorList()) {
                 ASSERT(current->pseudoType() == CSSSelector::PseudoHost || current->pseudoType() == CSSSelector::PseudoAny || current->pseudoType() == CSSSelector::PseudoNot);
                 for (const CSSSelector* selector = selectorList->first(); selector; selector = CSSSelectorList::next(*selector))
                     addFeaturesToInvalidationSets(*selector, features);
             }
         }
-        switch (current->relation()) {
-        case CSSSelector::SubSelector:
-            break;
-        case CSSSelector::ShadowPseudo:
-        case CSSSelector::ShadowDeep:
+
+        if (current->isShadowSelector())
             features.treeBoundaryCrossing = true;
-            features.wholeSubtree = false;
-            break;
-        case CSSSelector::Descendant:
-        case CSSSelector::Child:
-            features.wholeSubtree = false;
-            break;
-        case CSSSelector::DirectAdjacent:
-        case CSSSelector::IndirectAdjacent:
-            features.wholeSubtree = true;
-            break;
-        }
+
+        if (current->relation() != CSSSelector::SubSelector)
+            features.adjacent = current->isAdjacentSelector();

[Mike West, 2014/10/08 12:24:00]

This is even better. :)

     }
 }
 
 void RuleFeatureSet::addContentAttr(const AtomicString& attributeName)
 {
     ensureAttributeInvalidationSet(attributeName);
 }
 
 void RuleFeatureSet::collectFeaturesFromRuleData(const RuleData& ruleData)
 {
@@ skipping 212 matching lines @@
     visitor->trace(uncommonAttributeRules);
     visitor->trace(m_classInvalidationSets);
     visitor->trace(m_attributeInvalidationSets);
     visitor->trace(m_idInvalidationSets);
     visitor->trace(m_pseudoInvalidationSets);
     visitor->trace(m_styleInvalidator);
 #endif
 }
 
 } // namespace blink