Index: Source/core/css/RuleFeature.h |
diff --git a/Source/core/css/RuleFeature.h b/Source/core/css/RuleFeature.h |
index 2e6a9b74842a82ea439df605d6fbc39ba6ed8ec9..6cbcaed8e30eef0c54d9ce3e4195c37990a8a4aa 100644 |
--- a/Source/core/css/RuleFeature.h |
+++ b/Source/core/css/RuleFeature.h |
@@ -23,6 +23,7 @@ |
#define RuleFeature_h |
#include "core/css/invalidation/DescendantInvalidationSet.h" |
+#include "core/css/invalidation/StyleInvalidator.h" |
#include "wtf/Forward.h" |
#include "wtf/HashSet.h" |
#include "wtf/text/AtomicStringHash.h" |
@@ -89,9 +90,6 @@ public: |
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; |
@@ -102,14 +100,11 @@ public: |
// FIXME: record these internally to this class instead calls from StyleResolver to here. |
void addContentAttr(const AtomicString& attributeName); |
+ StyleInvalidator& styleInvalidator(); |
+ |
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; |
@@ -158,15 +153,11 @@ private: |
void addClassToInvalidationSet(const AtomicString& className, Element*); |
- InvalidationList& ensurePendingInvalidationList(Element*); |
- |
FeatureMetadata m_metadata; |
InvalidationSetMap m_classInvalidationSets; |
InvalidationSetMap m_attributeInvalidationSets; |
- |
- PendingInvalidationMap m_pendingInvalidationMap; |
- |
bool m_targetedStyleRecalcEnabled; |
+ StyleInvalidator m_styleInvalidator; |
}; |