Clean up ShadowRootRareData, ShadowRoot and SlotAssignment

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 17 matching lines @@
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/css/StyleSheetList.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/css/resolver/StyleSharingDepthScope.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/InsertionPoint.h"
-#include "core/dom/shadow/ShadowRootRareData.h"
 #include "core/dom/shadow/ShadowRootRareDataV0.h"
+#include "core/dom/shadow/SlotAssignment.h"
 #include "core/editing/serializers/Serialization.h"
 #include "core/html/HTMLShadowElement.h"
+#include "core/html/HTMLSlotElement.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope {

[kochi, 2016/04/28 08:36:36]

Looks you need to update this as well.

     char emptyClassFieldsDueToGCMixinMarker[1];
     Member<void*> willbeMember[3];
     unsigned countersAndFlags[1];
 };
 
 static_assert(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), "ShadowRoot should stay small");
 
 ShadowRoot::ShadowRoot(Document& document, ShadowRootType type)
     : DocumentFragment(0, CreateShadowRoot)
     , TreeScope(*this, document)
@@ skipping 38 matching lines @@
     DCHECK_EQ(type(), ShadowRootType::V0);
     ensureShadowRootRareDataV0().setYoungerShadowRoot(root);
 }
 
 void ShadowRoot::setOlderShadowRoot(ShadowRoot& root)
 {
     DCHECK_EQ(type(), ShadowRootType::V0);
     ensureShadowRootRareDataV0().setOlderShadowRoot(root);
 }
 
+SlotAssignment& ShadowRoot::ensureSlotAssignment()
+{
+    if (!m_slotAssignment)
+        m_slotAssignment = SlotAssignment::create();
+    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 87 matching lines @@
 {
     ++m_numberOfStyles;
 }
 
 void ShadowRoot::unregisterScopedHTMLStyleChild()
 {
     DCHECK_GT(m_numberOfStyles, 0u);
     --m_numberOfStyles;
 }
 
-ShadowRootRareData& ShadowRoot::ensureShadowRootRareData()
-{
-    if (m_shadowRootRareData)
-        return *m_shadowRootRareData;
-
-    m_shadowRootRareData = new ShadowRootRareData;
-    return *m_shadowRootRareData;
-}
-
 ShadowRootRareDataV0& ShadowRoot::ensureShadowRootRareDataV0()
 {
     if (m_shadowRootRareDataV0)
         return *m_shadowRootRareDataV0;
 
     m_shadowRootRareDataV0 = new ShadowRootRareDataV0;
     return *m_shadowRootRareDataV0;
 }
 
 bool ShadowRoot::containsShadowElements() const
 {
     return m_shadowRootRareDataV0 ? m_shadowRootRareDataV0->containsShadowElements() : false;
 }
 
 bool ShadowRoot::containsContentElements() const
 {
     return m_shadowRootRareDataV0 ? m_shadowRootRareDataV0->containsContentElements() : false;
 }
 
-bool ShadowRoot::containsShadowRoots() const
-{
-    return m_shadowRootRareData ? m_shadowRootRareData->containsShadowRoots() : false;
-}
-
 unsigned ShadowRoot::descendantShadowElementCount() const
 {
     return m_shadowRootRareDataV0 ? m_shadowRootRareDataV0->descendantShadowElementCount() : 0;
 }
 
 HTMLShadowElement* ShadowRoot::shadowInsertionPointOfYoungerShadowRoot() const
 {
     return m_shadowRootRareDataV0 ? m_shadowRootRareDataV0->shadowInsertionPointOfYoungerShadowRoot() : nullptr;
 }
 
 void ShadowRoot::setShadowInsertionPointOfYoungerShadowRoot(HTMLShadowElement* shadowInsertionPoint)
 {
     if (!m_shadowRootRareDataV0 && !shadowInsertionPoint)
         return;
     ensureShadowRootRareDataV0().setShadowInsertionPointOfYoungerShadowRoot(shadowInsertionPoint);
 }
 
 void ShadowRoot::didAddInsertionPoint(InsertionPoint* insertionPoint)
 {
     ensureShadowRootRareDataV0().didAddInsertionPoint(insertionPoint);
     invalidateDescendantInsertionPoints();
 }
 
 void ShadowRoot::didRemoveInsertionPoint(InsertionPoint* insertionPoint)
 {
     m_shadowRootRareDataV0->didRemoveInsertionPoint(insertionPoint);
     invalidateDescendantInsertionPoints();
 }
 
-void ShadowRoot::addChildShadowRoot()
-{
-    ensureShadowRootRareData().didAddChildShadowRoot();
-}
-
-void ShadowRoot::removeChildShadowRoot()
-{
-    // FIXME: Why isn't this an ASSERT?
-    if (!m_shadowRootRareData)
-        return;
-    m_shadowRootRareData->didRemoveChildShadowRoot();
-}
-
-unsigned ShadowRoot::childShadowRootCount() const
-{
-    return m_shadowRootRareData ? m_shadowRootRareData->childShadowRootCount() : 0;
-}
-
 void ShadowRoot::invalidateDescendantInsertionPoints()
 {
     m_descendantInsertionPointsIsValid = false;
     m_shadowRootRareDataV0->clearDescendantInsertionPoints();
 }
 
 const HeapVector<Member<InsertionPoint>>& ShadowRoot::descendantInsertionPoints()
 {
     DEFINE_STATIC_LOCAL(HeapVector<Member<InsertionPoint>>, emptyList, (new HeapVector<Member<InsertionPoint>>));
     if (m_shadowRootRareDataV0 && m_descendantInsertionPointsIsValid)
         return m_shadowRootRareDataV0->descendantInsertionPoints();
 
     m_descendantInsertionPointsIsValid = true;
 
     if (!containsInsertionPoints())
         return emptyList;
 
     HeapVector<Member<InsertionPoint>> insertionPoints;
     for (InsertionPoint& insertionPoint : Traversal<InsertionPoint>::descendantsOf(*this))
         insertionPoints.append(&insertionPoint);
 
     ensureShadowRootRareDataV0().setDescendantInsertionPoints(insertionPoints);
 
     return m_shadowRootRareDataV0->descendantInsertionPoints();
 }
 
-StyleSheetList* ShadowRoot::styleSheets()
+StyleSheetList& ShadowRoot::styleSheets()
 {
-    if (!ensureShadowRootRareData().styleSheets())
-        m_shadowRootRareData->setStyleSheets(StyleSheetList::create(this));
-
-    return m_shadowRootRareData->styleSheets();
+    if (!m_styleSheetList)
+        setStyleSheets(StyleSheetList::create(this));
+    return *m_styleSheetList;
 }
 
 void ShadowRoot::didAddSlot()
 {
-    ensureShadowRootRareData().didAddSlot();
+    ensureSlotAssignment().didAddSlot();
     invalidateDescendantSlots();
 }
 
 void ShadowRoot::didRemoveSlot()
 {
-    DCHECK(m_shadowRootRareData);
-    m_shadowRootRareData->didRemoveSlot();
+    DCHECK(m_slotAssignment);
+    m_slotAssignment->didRemoveSlot();
     invalidateDescendantSlots();
 }
 
 void ShadowRoot::invalidateDescendantSlots()
 {
+    DCHECK(m_slotAssignment);
     m_descendantSlotsIsValid = false;
-    m_shadowRootRareData->clearDescendantSlots();
+    m_slotAssignment->clearDescendantSlots();
 }
 
 unsigned ShadowRoot::descendantSlotCount() const
 {
-    return m_shadowRootRareData ? m_shadowRootRareData->descendantSlotCount() : 0;
+    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_shadowRootRareData);
-        return m_shadowRootRareData->descendantSlots();
+        DCHECK(m_slotAssignment);
+        return m_slotAssignment->descendantSlots();
     }
     if (descendantSlotCount() == 0)
         return emptyList;
 
-    DCHECK(m_shadowRootRareData);
+    DCHECK(m_slotAssignment);
     HeapVector<Member<HTMLSlotElement>> slots;
     slots.reserveCapacity(descendantSlotCount());
     for (HTMLSlotElement& slot : Traversal<HTMLSlotElement>::descendantsOf(rootNode()))
         slots.append(&slot);
-    m_shadowRootRareData->setDescendantSlots(slots);
+    m_slotAssignment->setDescendantSlots(slots);
     m_descendantSlotsIsValid = true;
-    return m_shadowRootRareData->descendantSlots();
+    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);
 }
 
 DEFINE_TRACE(ShadowRoot)
 {
-    visitor->trace(m_shadowRootRareData);
     visitor->trace(m_shadowRootRareDataV0);
     visitor->trace(m_slotAssignment);
+    visitor->trace(m_styleSheetList);
     TreeScope::trace(visitor);
     DocumentFragment::trace(visitor);
 }
 
 std::ostream& operator<<(std::ostream& ostream, const ShadowRootType& type)
 {
     switch (type) {
     case ShadowRootType::UserAgent:
         ostream << "ShadowRootType::UserAgent";
         break;
     case ShadowRootType::V0:
         ostream << "ShadowRootType::V0";
         break;
     case ShadowRootType::Open:
         ostream << "ShadowRootType::Open";
         break;
     case ShadowRootType::Closed:
         ostream << "ShadowRootType::Closed";
         break;
     }
     return ostream;
 }
 
 } // namespace blink