Collect content:attr(...)-features in RuleFeatureSet.

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 74 matching lines @@
     void scheduleStyleInvalidationForClassChange(const SpaceSplitString& oldClasses, const SpaceSplitString& newClasses, Element&);
     void scheduleStyleInvalidationForAttributeChange(const QualifiedName& attributeName, Element&);
     void scheduleStyleInvalidationForIdChange(const AtomicString& oldId, const AtomicString& newId, Element&);
     void scheduleStyleInvalidationForPseudoChange(CSSSelector::PseudoType, Element&);
 
     bool hasIdsInSelectors() const
     {
         return m_idInvalidationSets.size() > 0;
     }
 
-    // Marks the given attribute name as "appearing in a selector". Used for
-    // CSS properties such as content: ... attr(...) ...
-    // FIXME: record these internally to this class instead calls from StyleResolver to here.
-    void addContentAttr(const AtomicString& attributeName);
-
     StyleInvalidator& styleInvalidator();
 
     void trace(Visitor*);
 
     WillBeHeapVector<RuleFeature> siblingRules;
     WillBeHeapVector<RuleFeature> uncommonAttributeRules;
 
 protected:
     DescendantInvalidationSet* invalidationSetForSelector(const CSSSelector&);
 
@@ skipping 15 matching lines @@
         unsigned maxDirectAdjacentSelectors;
     };
 
     void collectFeaturesFromSelector(const CSSSelector&, FeatureMetadata&);
 
     DescendantInvalidationSet& ensureClassInvalidationSet(const AtomicString& className);
     DescendantInvalidationSet& ensureAttributeInvalidationSet(const AtomicString& attributeName);
     DescendantInvalidationSet& ensureIdInvalidationSet(const AtomicString& attributeName);
     DescendantInvalidationSet& ensurePseudoInvalidationSet(CSSSelector::PseudoType);
 
-    void updateInvalidationSets(const CSSSelector&);
+    void updateInvalidationSets(const RuleData&);
+    void updateInvalidationSetsForContentAttribute(const RuleData&);
 
     struct InvalidationSetFeatures {
         InvalidationSetFeatures()
             : customPseudoElement(false)
+            , hasBeforeOrAfter(false)
             , treeBoundaryCrossing(false)
             , adjacent(false)
             , insertionPointCrossing(false)
             , forceSubtree(false)
         { }
 
         bool useSubtreeInvalidation() const { return forceSubtree || adjacent; }
 
         Vector<AtomicString> classes;
         Vector<AtomicString> attributes;
         AtomicString id;
         AtomicString tagName;
         bool customPseudoElement;
+        bool hasBeforeOrAfter;
         bool treeBoundaryCrossing;
         bool adjacent;
         bool insertionPointCrossing;
         bool forceSubtree;
     };
 
     static bool extractInvalidationSetFeature(const CSSSelector&, InvalidationSetFeatures&);
 
     enum UseFeaturesType { UseFeatures, ForceSubtree };
 
     std::pair<const CSSSelector*, UseFeaturesType> extractInvalidationSetFeatures(const CSSSelector&, InvalidationSetFeatures&, bool negated);
 
     void addFeaturesToInvalidationSet(DescendantInvalidationSet&, const InvalidationSetFeatures&);
     void addFeaturesToInvalidationSets(const CSSSelector&, InvalidationSetFeatures&);
 
     void addClassToInvalidationSet(const AtomicString& className, Element&);
 
     FeatureMetadata m_metadata;
     InvalidationSetMap m_classInvalidationSets;
     InvalidationSetMap m_attributeInvalidationSets;
     InvalidationSetMap m_idInvalidationSets;
     PseudoTypeInvalidationSetMap m_pseudoInvalidationSets;
     StyleInvalidator m_styleInvalidator;
 };
 
 
 } // namespace blink
 
 #endif // RuleFeature_h