Rewrite Shadow DOM distribution engine to support partial synchronous distribution for v1

third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp

 /*
  * Copyright (C) 2011 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.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 43 matching lines @@
 
 ShadowRoot::ShadowRoot(Document& document, ShadowRootType type)
     : DocumentFragment(0, CreateShadowRoot)
     , TreeScope(*this, document)
     , m_numberOfStyles(0)
     , m_childShadowRootCount(0)
     , m_type(static_cast<unsigned>(type))
     , m_registeredWithParentShadowRoot(false)
     , m_descendantInsertionPointsIsValid(false)
     , m_delegatesFocus(false)
-    , m_descendantSlotsIsValid(false)
 {
 }
 
 ShadowRoot::~ShadowRoot()
 {
 }
 
 ShadowRoot* ShadowRoot::youngerShadowRoot() const
 {
     if (type() == ShadowRootType::V0 && m_shadowRootRareDataV0)
@@ skipping 25 matching lines @@
 
 void ShadowRoot::setOlderShadowRoot(ShadowRoot& root)
 {
     DCHECK_EQ(type(), ShadowRootType::V0);
     ensureShadowRootRareDataV0().setOlderShadowRoot(root);
 }
 
 SlotAssignment& ShadowRoot::ensureSlotAssignment()
 {
     if (!m_slotAssignment)
-        m_slotAssignment = SlotAssignment::create();
+        m_slotAssignment = SlotAssignment::create(*this);
     return *m_slotAssignment;
 }
 
-HTMLSlotElement* ShadowRoot::assignedSlotFor(const Node& node) const
-{
-    DCHECK(m_slotAssignment);
-    return m_slotAssignment->assignedSlotFor(node);
-}
-
 Node* ShadowRoot::cloneNode(bool, ExceptionState& exceptionState)
 {
     exceptionState.throwDOMException(NotSupportedError, "ShadowRoot nodes are not clonable.");
     return nullptr;
 }
 
 String ShadowRoot::innerHTML() const
 {
     return createMarkup(this, ChildrenOnly);
 }
@@ skipping 163 matching lines @@
     return m_shadowRootRareDataV0->descendantInsertionPoints();
 }
 
 StyleSheetList& ShadowRoot::styleSheets()
 {
     if (!m_styleSheetList)
         setStyleSheets(StyleSheetList::create(this));
     return *m_styleSheetList;
 }
 
-void ShadowRoot::didAddSlot()
-{
-    ensureSlotAssignment().didAddSlot();
-    invalidateDescendantSlots();
-}
-
-void ShadowRoot::didRemoveSlot()
-{
-    DCHECK(m_slotAssignment);
-    m_slotAssignment->didRemoveSlot();
-    invalidateDescendantSlots();
-}
-
-void ShadowRoot::invalidateDescendantSlots()
-{
-    DCHECK(m_slotAssignment);
-    m_descendantSlotsIsValid = false;
-    m_slotAssignment->clearDescendantSlots();
-}
-
-unsigned ShadowRoot::descendantSlotCount() const
-{
-    return m_slotAssignment ? m_slotAssignment->descendantSlotCount() : 0;
-}
-
-const HeapVector<Member<HTMLSlotElement>>& ShadowRoot::descendantSlots()
-{
-    DEFINE_STATIC_LOCAL(HeapVector<Member<HTMLSlotElement>>, emptyList, (new HeapVector<Member<HTMLSlotElement>>));
-    if (m_descendantSlotsIsValid) {
-        DCHECK(m_slotAssignment);
-        return m_slotAssignment->descendantSlots();
-    }
-    if (descendantSlotCount() == 0)
-        return emptyList;
-
-    DCHECK(m_slotAssignment);
-    HeapVector<Member<HTMLSlotElement>> slots;
-    slots.reserveCapacity(descendantSlotCount());
-    for (HTMLSlotElement& slot : Traversal<HTMLSlotElement>::descendantsOf(rootNode()))
-        slots.append(&slot);
-    m_slotAssignment->setDescendantSlots(slots);
-    m_descendantSlotsIsValid = true;
-    return m_slotAssignment->descendantSlots();
-}
-
-void ShadowRoot::assignV1()
-{
-    if (!m_slotAssignment)
-        m_slotAssignment = SlotAssignment::create();
-    m_slotAssignment->resolveAssignment(*this);
-}
-
 void ShadowRoot::distributeV1()
 {
-    if (!m_slotAssignment)
-        m_slotAssignment = SlotAssignment::create();
-    m_slotAssignment->resolveDistribution(*this);
+    ensureSlotAssignment().resolveDistribution();
 }
 
 DEFINE_TRACE(ShadowRoot)
 {
     visitor->trace(m_shadowRootRareDataV0);
     visitor->trace(m_slotAssignment);
     visitor->trace(m_styleSheetList);
     TreeScope::trace(visitor);
     DocumentFragment::trace(visitor);
 }
@@ skipping 17 matching lines @@
         ostream << "ShadowRootType::Open";
         break;
     case ShadowRootType::Closed:
         ostream << "ShadowRootType::Closed";
         break;
     }
     return ostream;
 }
 
 } // namespace blink