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 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "core/css/invalidation/DescendantInvalidationSet.h"
+#include "core/css/invalidation/InvalidationSet.h"
 
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Element.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "platform/TracedValue.h"
 #include "wtf/Compiler.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 static const unsigned char* s_tracingEnabled = nullptr;
 
 #define TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART_IF_ENABLED(element, reason, invalidationSet, singleSelectorPart) \
     if (UNLIKELY(*s_tracingEnabled)) \
         TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART(element, reason, invalidationSet, singleSelectorPart);
 
-void DescendantInvalidationSet::cacheTracingFlag()
+void InvalidationSet::cacheTracingFlag()
 {
     s_tracingEnabled = TRACE_EVENT_API_GET_CATEGORY_ENABLED(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"));
 }
 
-DescendantInvalidationSet::DescendantInvalidationSet()
-    : m_allDescendantsMightBeInvalid(false)
+InvalidationSet::InvalidationSet()
+    : m_maxDirectAdjacentSelectors(1)
+    , m_appliesDirectly(false)
+    , m_allDescendantsMightBeInvalid(false)
     , m_customPseudoInvalid(false)
     , m_treeBoundaryCrossing(false)
     , m_insertionPointCrossing(false)
 {
 }
 
-bool DescendantInvalidationSet::invalidatesElement(Element& element) const
+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());
         return true;
     }
 
     if (element.hasID() && m_ids && m_ids->contains(element.idForStyleResolution())) {
@@ skipping 16 matching lines @@
             if (element.hasAttribute(attribute)) {
                 TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART_IF_ENABLED(element, InvalidationSetMatchedAttribute, *this, attribute);
                 return true;
             }
         }
     }
 
     return false;
 }
 
-void DescendantInvalidationSet::combine(const DescendantInvalidationSet& other)
+void InvalidationSet::combine(const InvalidationSet& other)
 {
+    m_maxDirectAdjacentSelectors = std::max(m_maxDirectAdjacentSelectors, other.m_maxDirectAdjacentSelectors);
+
+    if (other.descendants())
+        ensureInvalidationSet().combine(*other.descendants());
+
+    if (other.appliesDirectly())
+        setAppliesDirectly();
+
     // No longer bother combining data structures, since the whole subtree is deemed invalid.
     if (wholeSubtreeInvalid())
         return;
 
     if (other.wholeSubtreeInvalid()) {
         setWholeSubtreeInvalid();
         return;
     }
 
     if (other.customPseudoInvalid())
@@ skipping 19 matching lines @@
         for (const auto& tagName : *other.m_tagNames)
             addTagName(tagName);
     }
 
     if (other.m_attributes) {
         for (const auto& attribute : *other.m_attributes)
             addAttribute(attribute);
     }
 }
 
-WillBeHeapHashSet<AtomicString>& DescendantInvalidationSet::ensureClassSet()
+WillBeHeapHashSet<AtomicString>& InvalidationSet::ensureClassSet()
 {
     if (!m_classes)
         m_classes = adoptPtrWillBeNoop(new WillBeHeapHashSet<AtomicString>);
     return *m_classes;
 }
 
-WillBeHeapHashSet<AtomicString>& DescendantInvalidationSet::ensureIdSet()
+WillBeHeapHashSet<AtomicString>& InvalidationSet::ensureIdSet()
 {
     if (!m_ids)
         m_ids = adoptPtrWillBeNoop(new WillBeHeapHashSet<AtomicString>);
     return *m_ids;
 }
 
-WillBeHeapHashSet<AtomicString>& DescendantInvalidationSet::ensureTagNameSet()
+WillBeHeapHashSet<AtomicString>& InvalidationSet::ensureTagNameSet()
 {
     if (!m_tagNames)
         m_tagNames = adoptPtrWillBeNoop(new WillBeHeapHashSet<AtomicString>);
     return *m_tagNames;
 }
 
-WillBeHeapHashSet<AtomicString>& DescendantInvalidationSet::ensureAttributeSet()
+WillBeHeapHashSet<AtomicString>& InvalidationSet::ensureAttributeSet()
 {
     if (!m_attributes)
         m_attributes = adoptPtrWillBeNoop(new WillBeHeapHashSet<AtomicString>);
     return *m_attributes;
 }
 
-void DescendantInvalidationSet::addClass(const AtomicString& className)
+InvalidationSet& InvalidationSet::ensureInvalidationSet()
+{
+    if (!m_descendantInvalidationSet)
+        m_descendantInvalidationSet = InvalidationSet::create();
+
+    return *m_descendantInvalidationSet;
+}
+
+void InvalidationSet::addClass(const AtomicString& className)
 {
     if (wholeSubtreeInvalid())
         return;
     ensureClassSet().add(className);
 }
 
-void DescendantInvalidationSet::addId(const AtomicString& id)
+void InvalidationSet::addId(const AtomicString& id)
 {
     if (wholeSubtreeInvalid())
         return;
     ensureIdSet().add(id);
 }
 
-void DescendantInvalidationSet::addTagName(const AtomicString& tagName)
+void InvalidationSet::addTagName(const AtomicString& tagName)
 {
     if (wholeSubtreeInvalid())
         return;
     ensureTagNameSet().add(tagName);
 }
 
-void DescendantInvalidationSet::addAttribute(const AtomicString& attribute)
+void InvalidationSet::addAttribute(const AtomicString& attribute)
 {
     if (wholeSubtreeInvalid())
         return;
     ensureAttributeSet().add(attribute);
 }
 
-void DescendantInvalidationSet::setWholeSubtreeInvalid()
+void InvalidationSet::setWholeSubtreeInvalid()
 {
     if (m_allDescendantsMightBeInvalid)
         return;
 
     m_allDescendantsMightBeInvalid = true;
     m_customPseudoInvalid = false;
     m_treeBoundaryCrossing = false;
     m_insertionPointCrossing = false;
     m_classes = nullptr;
     m_ids = nullptr;
     m_tagNames = nullptr;
     m_attributes = nullptr;
 }
 
-DEFINE_TRACE(DescendantInvalidationSet)
+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 DescendantInvalidationSet::toTracedValue(TracedValue* value) const
+void InvalidationSet::toTracedValue(TracedValue* value) const
 {
     value->beginDictionary();
 
     value->setString("id", descendantInvalidationSetToIdString(*this));
 
     if (m_allDescendantsMightBeInvalid)
         value->setBoolean("allDescendantsMightBeInvalid", true);
     if (m_customPseudoInvalid)
         value->setBoolean("customPseudoInvalid", true);
     if (m_treeBoundaryCrossing)
@@ skipping 26 matching lines @@
         value->beginArray("attributes");
         for (const auto& attribute : *m_attributes)
             value->pushString(attribute);
         value->endArray();
     }
 
     value->endDictionary();
 }
 
 #ifndef NDEBUG
-void DescendantInvalidationSet::show() const
+void InvalidationSet::show() const
 {
     RefPtr<TracedValue> value = TracedValue::create();
-    value->beginArray("DescendantInvalidationSet");
+    value->beginArray("InvalidationSet");
     toTracedValue(value.get());
     value->endArray();
     fprintf(stderr, "%s\n", value->asTraceFormat().ascii().data());
 }
 #endif // NDEBUG
 
 } // namespace blink