Add support for attribute selectors in TargetedStyleRecalc.

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 11 matching lines @@
 #ifndef RuleFeature_h
 #define RuleFeature_h
 
 #include "core/css/analyzer/DescendantInvalidationSet.h"
 #include "wtf/Forward.h"
 #include "wtf/HashSet.h"
 #include "wtf/text/AtomicStringHash.h"
 
 namespace WebCore {
 
+class CSSSelector;
+class CSSSelectorList;
 class Document;
 class Node;
+class QualifiedName;
+class RuleData;
 class ShadowRoot;
+class SpaceSplitString;
 class StyleRule;
-class CSSSelector;
-class CSSSelectorList;
-class RuleData;
-class SpaceSplitString;
 
 struct RuleFeature {
     RuleFeature(StyleRule* rule, unsigned selectorIndex, bool hasDocumentSecurityOrigin)
         : rule(rule)
         , selectorIndex(selectorIndex)
         , hasDocumentSecurityOrigin(hasDocumentSecurityOrigin)
     {
     }
     StyleRule* rule;
     unsigned selectorIndex;
@@ skipping 12 matching lines @@
 
     bool usesSiblingRules() const { return !siblingRules.isEmpty(); }
     bool usesFirstLineRules() const { return m_metadata.usesFirstLineRules; }
 
     unsigned maxDirectAdjacentSelectors() const { return m_metadata.maxDirectAdjacentSelectors; }
     void setMaxDirectAdjacentSelectors(unsigned value)  { m_metadata.maxDirectAdjacentSelectors = std::max(value, m_metadata.maxDirectAdjacentSelectors); }
 
     inline bool hasSelectorForAttribute(const AtomicString& attributeName) const
     {
         ASSERT(!attributeName.isEmpty());
-        return m_metadata.attrsInRules.contains(attributeName);
+        return m_attributeInvalidationSets.get(attributeName);
     }
 
     inline bool hasSelectorForClass(const AtomicString& classValue) const
     {
         ASSERT(!classValue.isEmpty());
         return m_classInvalidationSets.get(classValue);
     }
 
     inline bool hasSelectorForId(const AtomicString& idValue) const
     {
         return m_metadata.idsInRules.contains(idValue);
     }
 
     void scheduleStyleInvalidationForClassChange(const SpaceSplitString& changedClasses, Element*);
     void scheduleStyleInvalidationForClassChange(const SpaceSplitString& oldClasses, const SpaceSplitString& newClasses, Element*);
 
+    void scheduleStyleInvalidationForAttributeChange(const QualifiedName& attributeName, Element*);
+
     // Clears all style invalidation state for the passed node.
     void clearStyleInvalidation(Node*);
 
     int hasIdsInSelectors() const
     {
         return m_metadata.idsInRules.size() > 0;
     }
 
     // Marks the given attribute name as "appearing in a selector". Used for
     // CSS properties such as content: ... attr(...) ...
-    void addAttributeInASelector(const AtomicString& attributeName);
+    // FIXME: record these internally to this class instead calls from StyleResolver to here.
+    void addAttributeFromAContentAttrValue(const AtomicString& attributeName);
 
     Vector<RuleFeature> siblingRules;
     Vector<RuleFeature> uncommonAttributeRules;
 
     typedef Vector<RefPtr<DescendantInvalidationSet> > InvalidationList;
     typedef HashMap<Element*, OwnPtr<InvalidationList> > PendingInvalidationMap;
 
     PendingInvalidationMap& pendingInvalidationMap();
 
 private:
     typedef HashMap<AtomicString, RefPtr<DescendantInvalidationSet> > InvalidationSetMap;
 
     struct FeatureMetadata {
         FeatureMetadata()
             : usesFirstLineRules(false)
             , foundSiblingSelector(false)
             , maxDirectAdjacentSelectors(0)
         { }
         void add(const FeatureMetadata& other);
         void clear();
 
         bool usesFirstLineRules;
         bool foundSiblingSelector;
         unsigned maxDirectAdjacentSelectors;
         HashSet<AtomicString> idsInRules;
-        HashSet<AtomicString> attrsInRules;
     };
 
     enum InvalidationSetMode {
         AddFeatures,
         UseLocalStyleChange,
         UseSubtreeStyleChange
     };
 
     static InvalidationSetMode supportsClassDescendantInvalidation(const CSSSelector&);
 
     void collectFeaturesFromSelector(const CSSSelector&, FeatureMetadata&, InvalidationSetMode);
     void collectFeaturesFromSelectorList(const CSSSelectorList*, FeatureMetadata&, InvalidationSetMode);
 
     DescendantInvalidationSet& ensureClassInvalidationSet(const AtomicString& className);
-    InvalidationSetMode updateClassInvalidationSets(const CSSSelector&);
+    DescendantInvalidationSet& ensureAttributeInvalidationSet(const AtomicString& className);
+    DescendantInvalidationSet* invalidationSetForSelector(const CSSSelector&);
+
+    InvalidationSetMode updateInvalidationSets(const CSSSelector&);
 
     void addClassToInvalidationSet(const AtomicString& className, Element*);
 
     InvalidationList& ensurePendingInvalidationList(Element*);
 
     FeatureMetadata m_metadata;
     InvalidationSetMap m_classInvalidationSets;
+    InvalidationSetMap m_attributeInvalidationSets;
+
     PendingInvalidationMap m_pendingInvalidationMap;
 
     bool m_targetedStyleRecalcEnabled;
 };
 
 
 } // namespace WebCore
 
 #endif // RuleFeature_h