Sibling invalidation sets

Source/core/css/invalidation/InvalidationSet.cpp

 /*
  * 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 39 matching lines @@
 {
     s_tracingEnabled = TRACE_EVENT_API_GET_CATEGORY_ENABLED(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"));
 }
 
 InvalidationSet::InvalidationSet()
     : m_allDescendantsMightBeInvalid(false)
     , m_invalidatesSelf(false)
     , m_customPseudoInvalid(false)
     , m_treeBoundaryCrossing(false)
     , m_insertionPointCrossing(false)
+    , m_maxDirectAdjacentSelectors(1)
 {
 }
 
 bool InvalidationSet::invalidatesElement(Element& element) const
 {
     if (m_allDescendantsMightBeInvalid)
         return true;
 
     if (m_tagNames && m_tagNames->contains(element.tagQName().localName())) {
         TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART_IF_ENABLED(element, InvalidationSetMatchedTagName, *this, element.tagQName().localName());
@@ skipping 22 matching lines @@
                 return true;
             }
         }
     }
 
     return false;
 }
 
 void InvalidationSet::combine(const InvalidationSet& other)
 {
+    m_maxDirectAdjacentSelectors = std::max(m_maxDirectAdjacentSelectors, other.m_maxDirectAdjacentSelectors);
+
+    if (other.descendants())
+        ensureDescendantInvalidationSet().combine(*other.descendants());
+
     // No longer bother combining data structures, since the whole subtree is deemed invalid.
     if (wholeSubtreeInvalid())
         return;
 
     if (other.wholeSubtreeInvalid()) {
         setWholeSubtreeInvalid();
         return;
     }
 
     if (other.invalidatesSelf())
@@ skipping 50 matching lines @@
     return *m_tagNames;
 }
 
 WillBeHeapHashSet<AtomicString>& InvalidationSet::ensureAttributeSet()
 {
     if (!m_attributes)
         m_attributes = adoptPtrWillBeNoop(new WillBeHeapHashSet<AtomicString>);
     return *m_attributes;
 }
 
+InvalidationSet& InvalidationSet::ensureDescendantInvalidationSet()
+{
+    if (!m_descendantInvalidationSet)
+        m_descendantInvalidationSet = InvalidationSet::create();
+
+    return *m_descendantInvalidationSet;
+}
+
 void InvalidationSet::addClass(const AtomicString& className)
 {
     if (wholeSubtreeInvalid())
         return;
     ensureClassSet().add(className);
 }
 
 void InvalidationSet::addId(const AtomicString& id)
 {
     if (wholeSubtreeInvalid())
@@ skipping 30 matching lines @@
     m_attributes = nullptr;
 }
 
 DEFINE_TRACE(InvalidationSet)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_classes);
     visitor->trace(m_ids);
     visitor->trace(m_tagNames);
     visitor->trace(m_attributes);
+    visitor->trace(m_descendantInvalidationSet);
 #endif
 }
 
 void InvalidationSet::toTracedValue(TracedValue* value) const
 {
     value->beginDictionary();
 
     value->setString("id", descendantInvalidationSetToIdString(*this));
 
     if (m_allDescendantsMightBeInvalid)
@@ skipping 41 matching lines @@
 {
     RefPtr<TracedValue> value = TracedValue::create();
     value->beginArray("InvalidationSet");
     toTracedValue(value.get());
     value->endArray();
     fprintf(stderr, "%s\n", value->asTraceFormat().ascii().data());
 }
 #endif // NDEBUG
 
 } // namespace blink