Sibling invalidation sets

Source/core/css/invalidation/InvalidationSet.h

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 48 matching lines @@
 
     bool invalidatesElement(Element&) const;
 
     void combine(const InvalidationSet& other);
 
     void addClass(const AtomicString& className);
     void addId(const AtomicString& id);
     void addTagName(const AtomicString& tagName);
     void addAttribute(const AtomicString& attributeLocalName);
 
+    const InvalidationSet* descendants() const { return m_descendantInvalidationSet.get(); }
+
+    InvalidationSet& ensureDescendantInvalidationSet();
+
+    void setAppliesDirectly() { m_appliesDirectly = true; }
+    bool appliesDirectly() const { return m_appliesDirectly; }
+
     void setWholeSubtreeInvalid();
     bool wholeSubtreeInvalid() const { return m_allDescendantsMightBeInvalid; }
 
     void setTreeBoundaryCrossing() { m_treeBoundaryCrossing = true; }
     bool treeBoundaryCrossing() const { return m_treeBoundaryCrossing; }
 
     void setInsertionPointCrossing() { m_insertionPointCrossing = true; }
     bool insertionPointCrossing() const { return m_insertionPointCrossing; }
 
     void setCustomPseudoInvalid() { m_customPseudoInvalid = true; }
     bool customPseudoInvalid() const { return m_customPseudoInvalid; }
 
+    unsigned maxDirectAdjacentSelectors() const { return m_maxDirectAdjacentSelectors; }
+    void updateMaxDirectAdjacentSelectors(unsigned value) { m_maxDirectAdjacentSelectors = std::max(value, m_maxDirectAdjacentSelectors); }
+
     bool isEmpty() const { return !m_classes && !m_ids && !m_tagNames && !m_attributes && !m_customPseudoInvalid; }
 
     DECLARE_TRACE();
 
     void toTracedValue(TracedValue*) const;
 
 #ifndef NDEBUG
     void show() const;
 #endif
 
 private:
     InvalidationSet();
 
     WillBeHeapHashSet<AtomicString>& ensureClassSet();
     WillBeHeapHashSet<AtomicString>& ensureIdSet();
     WillBeHeapHashSet<AtomicString>& ensureTagNameSet();
     WillBeHeapHashSet<AtomicString>& ensureAttributeSet();
 
     // FIXME: optimize this if it becomes a memory issue.
     OwnPtrWillBeMember<WillBeHeapHashSet<AtomicString>> m_classes;
     OwnPtrWillBeMember<WillBeHeapHashSet<AtomicString>> m_ids;
     OwnPtrWillBeMember<WillBeHeapHashSet<AtomicString>> m_tagNames;
     OwnPtrWillBeMember<WillBeHeapHashSet<AtomicString>> m_attributes;
 
+    // Only for sibling invalidation sets, indicates the maximum possible number of siblings affected.
+    unsigned m_maxDirectAdjacentSelectors;
+
+    // Only for sibling invalidation sets, indicates the descendants of siblings.
+    RefPtrWillBeMember<InvalidationSet> m_descendantInvalidationSet;
+
+    // Indicates the sibling/descendant itself is invalid.
+    unsigned m_appliesDirectly : 1;

[rune, 2015/09/14 23:06:51]

I'd still like to see this split out as a separate CL. A lot of the expected
test result changes are for the descendant case with !appliesDirectly, right?

[Eric Willigers, 2015/09/15 05:39:18]

Removed for now. Yes, may of the expected test result changes don't involve
sibling selectors.

+
     // If true, all descendants might be invalidated, so a full subtree recalc is required.
     unsigned m_allDescendantsMightBeInvalid : 1;
 
     // If true, all descendants which are custom pseudo elements must be invalidated.
     unsigned m_customPseudoInvalid : 1;
 
     // If true, the invalidation must traverse into ShadowRoots with this set.
     unsigned m_treeBoundaryCrossing : 1;
 
     // If true, insertion point descendants must be invalidated.
     unsigned m_insertionPointCrossing : 1;
+
+    friend class RuleFeatureSetTest;
 };
 
+using InvalidationSetVector = WillBeHeapVector<RefPtrWillBeMember<InvalidationSet>, 8>;
+
 } // namespace blink
 
 #endif // InvalidationSet_h