Refactored invalidation set extraction.

third_party/WebKit/Source/core/css/RuleFeature.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 62 matching lines @@
     SelectorPreMatch collectFeaturesFromRuleData(const RuleData&);
 
     bool usesSiblingRules() const { return !siblingRules.isEmpty(); }
     bool usesFirstLineRules() const { return m_metadata.usesFirstLineRules; }
     bool usesWindowInactiveSelector() const { return m_metadata.usesWindowInactiveSelector; }
 
     unsigned maxDirectAdjacentSelectors() const { return m_metadata.maxDirectAdjacentSelectors; }
 
     bool hasSelectorForAttribute(const AtomicString& attributeName) const
     {
-        ASSERT(!attributeName.isEmpty());
+        DCHECK(!attributeName.isEmpty());
         return m_attributeInvalidationSets.contains(attributeName);
     }
 
     bool hasSelectorForClass(const AtomicString& classValue) const
     {
-        ASSERT(!classValue.isEmpty());
+        DCHECK(!classValue.isEmpty());
         return m_classInvalidationSets.contains(classValue);
     }
 
     bool hasSelectorForId(const AtomicString& idValue) const { return m_idInvalidationSets.contains(idValue); }
 
     // Collect descendant and sibling invalidation sets.
     void collectInvalidationSetsForClass(InvalidationLists&, Element&, const AtomicString& className) const;
     void collectInvalidationSetsForId(InvalidationLists&, Element&, const AtomicString& id) const;
     void collectInvalidationSetsForAttribute(InvalidationLists&, Element&, const QualifiedName& attributeName) const;
     void collectInvalidationSetsForPseudoClass(InvalidationLists&, Element&, CSSSelector::PseudoType) const;
@@ skipping 10 matching lines @@
     }
 
     DECLARE_TRACE();
 
     HeapVector<RuleFeature> siblingRules;
     HeapVector<RuleFeature> uncommonAttributeRules;
 
     bool isAlive() const { return m_isAlive; }
 
 protected:
-    InvalidationSet* invalidationSetForSelector(const CSSSelector&, InvalidationType);
+    InvalidationSet* invalidationSetForSimpleSelector(const CSSSelector&, InvalidationType);
 
 private:
     // Each map entry is either a DescendantInvalidationSet or SiblingInvalidationSet.
     // When both are needed, we store the SiblingInvalidationSet, and use it to hold the DescendantInvalidationSet.
     using InvalidationSetMap = HashMap<AtomicString, RefPtr<InvalidationSet>>;
     using PseudoTypeInvalidationSetMap = HashMap<CSSSelector::PseudoType, RefPtr<InvalidationSet>, WTF::IntHash<unsigned>, WTF::UnsignedWithZeroKeyHashTraits<unsigned>>;
 
     struct FeatureMetadata {
         DISALLOW_NEW();
         void add(const FeatureMetadata& other);
@@ skipping 14 matching lines @@
     InvalidationSet& ensurePseudoInvalidationSet(CSSSelector::PseudoType, InvalidationType);
     SiblingInvalidationSet& ensureUniversalSiblingInvalidationSet();
     DescendantInvalidationSet& ensureNthInvalidationSet();
 
     void updateInvalidationSets(const RuleData&);
     void updateInvalidationSetsForContentAttribute(const RuleData&);
 
     struct InvalidationSetFeatures {
         DISALLOW_NEW();
 
+        void add(const InvalidationSetFeatures& other);
+        bool hasFeatures() const;
+
         Vector<AtomicString> classes;
         Vector<AtomicString> attributes;
         Vector<AtomicString> ids;
         Vector<AtomicString> tagNames;
-        unsigned maxDirectAdjacentSelectors = UINT_MAX;
+        unsigned maxDirectAdjacentSelectors = 0;
         bool customPseudoElement = false;
         bool hasBeforeOrAfter = false;
         bool treeBoundaryCrossing = false;
-        bool adjacent = false;
         bool insertionPointCrossing = false;
         bool forceSubtree = false;
         bool contentPseudoCrossing = false;
         bool invalidatesSlotted = false;
         bool hasNthPseudo = false;
     };
 
-    static bool extractInvalidationSetFeature(const CSSSelector&, InvalidationSetFeatures&);
+    static void extractInvalidationSetFeature(const CSSSelector&, InvalidationSetFeatures&);
 
     enum UseFeaturesType { UseFeatures, ForceSubtree };
 
     enum PositionType { Subject, Ancestor };
-    std::pair<const CSSSelector*, UseFeaturesType> extractInvalidationSetFeatures(const CSSSelector&, InvalidationSetFeatures&, PositionType, CSSSelector::PseudoType = CSSSelector::PseudoUnknown);
+
+    void extractInvalidationSetFeaturesFromSimpleSelector(const CSSSelector&, InvalidationSetFeatures&);
+    const CSSSelector* extractInvalidationSetFeaturesFromCompound(const CSSSelector&, InvalidationSetFeatures&, PositionType, CSSSelector::PseudoType = CSSSelector::PseudoUnknown);
+    const CSSSelector* extractInvalidationSetFeaturesFromSelectorList(const CSSSelector&, InvalidationSetFeatures&, PositionType);
+    void updateFeaturesFromCombinator(const CSSSelector&,
+        const CSSSelector* lastCompoundSelectorInAdjacentChain,
+        InvalidationSetFeatures& lastCompoundInAdjacentChainFeatures,
+        InvalidationSetFeatures*& siblingFeatures,
+        InvalidationSetFeatures& descendantFeatures);
 
     void addFeaturesToInvalidationSet(InvalidationSet&, const InvalidationSetFeatures&);
-    void addFeaturesToInvalidationSets(const CSSSelector*, InvalidationSetFeatures* siblingFeatures, InvalidationSetFeatures& descendantFeatures);
+    void addFeaturesToInvalidationSets(const CSSSelector&, InvalidationSetFeatures& descendantFeatures);
+    const CSSSelector* addFeaturesToInvalidationSetsForCompoundSelector(const CSSSelector&, InvalidationSetFeatures* siblingFeatures, InvalidationSetFeatures& descendantFeatures);
+    void addFeaturesToInvalidationSetsForSimpleSelector(const CSSSelector&, InvalidationSetFeatures* siblingFeatures, InvalidationSetFeatures& descendantFeatures);
+    void addFeaturesToInvalidationSetsForSelectorList(const CSSSelector&, InvalidationSetFeatures* siblingFeatures, InvalidationSetFeatures& descendantFeatures);
     void addFeaturesToUniversalSiblingInvalidationSet(const InvalidationSetFeatures& siblingFeatures, const InvalidationSetFeatures& descendantFeatures);
 
     void addClassToInvalidationSet(const AtomicString& className, Element&);
 
     FeatureMetadata m_metadata;
     InvalidationSetMap m_classInvalidationSets;
     InvalidationSetMap m_attributeInvalidationSets;
     InvalidationSetMap m_idInvalidationSets;
     PseudoTypeInvalidationSetMap m_pseudoInvalidationSets;
     RefPtr<SiblingInvalidationSet> m_universalSiblingInvalidationSet;
     RefPtr<DescendantInvalidationSet> m_nthInvalidationSet;
 
     // If true, the RuleFeatureSet is alive and can be used.
     unsigned m_isAlive : 1;
 
     friend class RuleFeatureSetTest;
 };
 
 } // namespace blink
 
 #endif // RuleFeature_h