Refactor StyleInvalidator to encapsulate all style invalidation state.

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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef RuleFeature_h
 #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"
 
 namespace WebCore {
 
 class CSSSelector;
 class CSSSelectorList;
 class Document;
 class Node;
@@ skipping 41 matching lines @@
     {
         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 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*);
+    void scheduleStyleInvalidationForAttributeChange(const QualifiedName& attributeName, Element&);
 
     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(...) ...
     // 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;
 
     struct FeatureMetadata {
         FeatureMetadata()
             : usesFirstLineRules(false)
             , foundSiblingSelector(false)
             , maxDirectAdjacentSelectors(0)
         { }
         void add(const FeatureMetadata& other);
@@ skipping 26 matching lines @@
         Vector<AtomicString> classes;
         Vector<AtomicString> attributes;
         AtomicString id;
         AtomicString tagName;
     };
 
     static void extractInvalidationSetFeature(const CSSSelector&, InvalidationSetFeatures&);
     const CSSSelector* extractInvalidationSetFeatures(const CSSSelector&, InvalidationSetFeatures&);
     void addFeaturesToInvalidationSets(const CSSSelector&, const InvalidationSetFeatures&);
 
-    void addClassToInvalidationSet(const AtomicString& className, Element*);
-
-    InvalidationList& ensurePendingInvalidationList(Element*);
+    void addClassToInvalidationSet(const AtomicString& className, Element&);
 
     FeatureMetadata m_metadata;
     InvalidationSetMap m_classInvalidationSets;
     InvalidationSetMap m_attributeInvalidationSets;
-
-    PendingInvalidationMap m_pendingInvalidationMap;
-
     bool m_targetedStyleRecalcEnabled;
+    StyleInvalidator m_styleInvalidator;
 };
 
 
 } // namespace WebCore
 
 #endif // RuleFeature_h