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 440002260098e51a0748129c8d82599039d91aeb..a2675fdbce9c13ee6db8f1ba518137018d22cb74 100644
--- a/Source/core/css/invalidation/StyleInvalidator.h
+++ b/Source/core/css/invalidation/StyleInvalidator.h
@@ -5,14 +5,15 @@
 #ifndef StyleInvalidator_h
 #define StyleInvalidator_h
 
+#include "core/css/invalidation/InvalidationListData.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
 
-class DescendantInvalidationSet;
 class Document;
 class Element;
+class InvalidationSet;
 
 class StyleInvalidator {
     DISALLOW_ALLOCATION();
@@ -21,7 +22,7 @@ public:
     StyleInvalidator();
     ~StyleInvalidator();
     void invalidate(Document&);
-    void scheduleInvalidation(PassRefPtrWillBeRawPtr<DescendantInvalidationSet>, Element&);
+    void scheduleInvalidationSetsForElement(const InvalidationSetVector& descendant, const InvalidationSetVector& sibling, Element&);
     void clearInvalidation(Element&);
 
     void clearPendingInvalidations();
@@ -37,8 +38,8 @@ private:
             , m_insertionPointCrossing(false)
         { }
 
-        void pushInvalidationSet(const DescendantInvalidationSet&);
-        bool matchesCurrentInvalidationSets(Element&);
+        void pushInvalidationSet(const InvalidationSet&);
+        bool matchesCurrentInvalidationSets(Element&) const;
         bool hasInvalidationSets() const { return !wholeSubtreeInvalid() && m_invalidationSets.size(); }
 
         bool wholeSubtreeInvalid() const { return m_wholeSubtreeInvalid; }
@@ -47,7 +48,7 @@ private:
         bool treeBoundaryCrossing() const { return m_treeBoundaryCrossing; }
         bool insertionPointCrossing() const { return m_insertionPointCrossing; }
 
-        using InvalidationSets = Vector<const DescendantInvalidationSet*, 16>;
+        using InvalidationSets = Vector<const InvalidationSet*, 16>;
         InvalidationSets m_invalidationSets;
         bool m_invalidateCustomPseudo;
         bool m_wholeSubtreeInvalid;
@@ -55,9 +56,30 @@ 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++; }
+
+        struct Entry {
+            RawPtrWillBeMember<const InvalidationSet> invalidationSet;
+            unsigned invalidationLimit;
+        };
+
+        WillBeHeapVector<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 +109,9 @@ private:
         RecursionData* m_data;
     };
 
-    using InvalidationList = WillBeHeapVector<RefPtrWillBeMember<DescendantInvalidationSet>>;
-    using PendingInvalidationMap = WillBeHeapHashMap<RawPtrWillBeMember<Element>, OwnPtrWillBeMember<InvalidationList>>;
+    using PendingInvalidationMap = WillBeHeapHashMap<RawPtrWillBeMember<Element>, OwnPtrWillBeMember<InvalidationListData>>;
 
-    InvalidationList& ensurePendingInvalidationList(Element&);
+    InvalidationListData& ensurePendingInvalidationListData(Element&);
 
     PendingInvalidationMap m_pendingInvalidationMap;
 };