Refactor StyleInvalidator to encapsulate all style invalidation state.

Source/core/css/invalidation/StyleInvalidator.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef StyleInvalidator_h
 #define StyleInvalidator_h
 
-#include "core/css/RuleFeature.h"
 #include "heap/Heap.h"
 
 namespace WebCore {
 
+class DescendantInvalidationSet;
+class Document;
+class Element;
+
 class StyleInvalidator {
-    STACK_ALLOCATED();
 public:
-    explicit StyleInvalidator(Document&);
-    void invalidate();
+    explicit StyleInvalidator();
+    void invalidate(Document&);
+    void scheduleInvalidation(PassRefPtr<DescendantInvalidationSet>, Element*);

[esprehn, 2014/03/31 18:20:39]

by reference

[chrishtr, 2014/03/31 19:22:59]

Done.

+
+    // Clears all style invalidation state for the passed node.
+    void clearStyleInvalidation(Node*);

[esprehn, 2014/03/31 18:20:39]

by reference

[chrishtr, 2014/03/31 19:22:59]

Done.

+
+    void clear();

[esprehn, 2014/03/31 18:20:39]

This needs a better name.

[chrishtr, 2014/03/31 19:22:59]

Done.

 
 private:
     bool invalidate(Element&);
     bool invalidateChildren(Element&);
 
     bool checkInvalidationSetsAgainstElement(Element&);
 
     struct RecursionData {
-        RecursionData() : m_foundInvalidationSet(false) { }
+        RecursionData();
         void pushInvalidationSet(const DescendantInvalidationSet&);
         bool matchesCurrentInvalidationSets(Element&);
         bool foundInvalidationSet() { return m_foundInvalidationSet; }
+        void clear();
 
         Vector<AtomicString> m_invalidationClasses;
         Vector<AtomicString> m_invalidationAttributes;
         bool m_foundInvalidationSet;
     };
 
     class RecursionCheckpoint {
     public:
         RecursionCheckpoint(RecursionData* data)
             : m_prevClassLength(data->m_invalidationClasses.size()),
             m_prevAttributeLength(data->m_invalidationAttributes.size()),
             m_prevFoundInvalidationSet(data->m_foundInvalidationSet),
             m_data(data)
         { }
         ~RecursionCheckpoint()
         {
             m_data->m_invalidationClasses.remove(m_prevClassLength, m_data->m_invalidationClasses.size() - m_prevClassLength);
             m_data->m_invalidationAttributes.remove(m_prevAttributeLength, m_data->m_invalidationAttributes.size() - m_prevAttributeLength);
             m_data->m_foundInvalidationSet = m_prevFoundInvalidationSet;
         }
 
     private:
         int m_prevClassLength;
         int m_prevAttributeLength;
         bool m_prevFoundInvalidationSet;
         RecursionData* m_data;
     };
 
-    Document& m_document;
-    RuleFeatureSet::PendingInvalidationMap& m_pendingInvalidationMap;
+    typedef Vector<RefPtr<DescendantInvalidationSet> > InvalidationList;
+    typedef HashMap<Element*, OwnPtr<InvalidationList> > PendingInvalidationMap;
+
+    InvalidationList& ensurePendingInvalidationList(Element*);
+
+    PendingInvalidationMap m_pendingInvalidationMap;
     RecursionData m_recursionData;
 };
 
 } // namespace WebCore
 
 #endif // StyleInvalidator_h