Sibling invalidation sets

Source/core/css/invalidation/StyleInvalidator.h

Index: Source/core/css/invalidation/StyleInvalidator.h
diff --git a/Source/core/css/invalidation/StyleInvalidator.h b/Source/core/css/invalidation/StyleInvalidator.h
index 477be9d513344669ee556f639aba13f64e13eaa5..43e7a5ef1e7423a8305e768da2b4b70f9f1f3583 100644
--- a/Source/core/css/invalidation/StyleInvalidator.h
+++ b/Source/core/css/invalidation/StyleInvalidator.h
@@ -5,14 +5,16 @@
 #ifndef StyleInvalidator_h
 #define StyleInvalidator_h
 
+#include "core/css/invalidation/PendingInvalidations.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
 
-class InvalidationSet;
 class Document;
 class Element;
+class InvalidationSet;
+
 
 class StyleInvalidator {
     DISALLOW_ALLOCATION();
@@ -21,11 +23,9 @@ public:
     StyleInvalidator();
     ~StyleInvalidator();
     void invalidate(Document&);
-    void scheduleInvalidation(PassRefPtrWillBeRawPtr<InvalidationSet>, Element&);
+    void scheduleInvalidationSetsForElement(const InvalidationLists&, Element&);
     void clearInvalidation(Element&);
 
-    void clearPendingInvalidations();
-
     DECLARE_TRACE();
 
 private:
@@ -38,7 +38,7 @@ private:
         { }
 
         void pushInvalidationSet(const InvalidationSet&);
-        bool matchesCurrentInvalidationSets(Element&);
+        bool matchesCurrentInvalidationSets(Element&) const;
         bool hasInvalidationSets() const { return !wholeSubtreeInvalid() && m_invalidationSets.size(); }
 
         bool wholeSubtreeInvalid() const { return m_wholeSubtreeInvalid; }
@@ -55,9 +55,37 @@ private:
         bool m_insertionPointCrossing;
     };
 
-    bool invalidate(Element&, RecursionData&);
+    class SiblingData {
+        STACK_ALLOCATED();
+    public:
+        SiblingData()
+            : m_elementIndex(0)
+        { }
+
+        void pushInvalidationSet(const InvalidationSet&);
+        bool matchCurrentInvalidationSets(Element&, RecursionData&);
+
+        void advance() { m_elementIndex++; }
+
+    private:
+        struct Entry {
+            ALLOW_ONLY_INLINE_ALLOCATION();
+            Entry(const InvalidationSet* invalidationSet, unsigned invalidationLimit)
+                : m_invalidationSet(invalidationSet)
+                , m_invalidationLimit(invalidationLimit)
+            {}
+
+            RawPtrWillBeMember<const InvalidationSet> m_invalidationSet;
+            unsigned m_invalidationLimit;
+        };
+
+        Vector<Entry, 16> m_invalidationEntries;
+        unsigned m_elementIndex;
+    };
+
+    bool invalidate(Element&, RecursionData&, SiblingData&);
     bool invalidateChildren(Element&, RecursionData&);
-    bool checkInvalidationSetsAgainstElement(Element&, RecursionData&);
+    bool checkInvalidationSetsAgainstElement(Element&, RecursionData&, SiblingData&);
 
     class RecursionCheckpoint {
     public:
@@ -87,10 +115,9 @@ private:
         RecursionData* m_data;
     };
 
-    using InvalidationList = WillBeHeapVector<RefPtrWillBeMember<InvalidationSet>>;
-    using PendingInvalidationMap = WillBeHeapHashMap<RawPtrWillBeMember<Element>, OwnPtrWillBeMember<InvalidationList>>;
+    using PendingInvalidationMap = WillBeHeapHashMap<RawPtrWillBeMember<Element>, RefPtrWillBeMember<PendingInvalidations>>;
 
-    InvalidationList& ensurePendingInvalidationList(Element&);
+    PendingInvalidations& ensurePendingInvalidations(Element&);
 
     PendingInvalidationMap m_pendingInvalidationMap;
 };