Index: third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp |
diff --git a/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp b/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp |
index 024e3647d811dc7f998bf3f6d685313811209c35..62fee7de6dbcf0885231ac833fddb6c015678c1f 100644 |
--- a/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp |
+++ b/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp |
@@ -71,6 +71,10 @@ inline void DistributionPool::populateChildren(const ContainerNode& parent) |
{ |
clear(); |
for (Node* child = parent.firstChild(); child; child = child->nextSibling()) { |
+ if (isHTMLSlotElement(child)) { |
+ // TODO(hayato): Support re-distribution across v0 and v1 shadow trees |
+ continue; |
+ } |
if (isActiveInsertionPoint(*child)) { |
InsertionPoint* insertionPoint = toInsertionPoint(child); |
for (size_t i = 0; i < insertionPoint->distributedNodesSize(); ++i) |
@@ -328,7 +332,9 @@ void ElementShadow::distributeV0() |
void ElementShadow::distributeV1() |
{ |
- // TODO(hayato): Implement this |
+ if (!m_slotAssignment) |
+ m_slotAssignment = adoptPtr(new SlotAssignment()); |
+ m_slotAssignment->resolveAssignment(youngestShadowRoot()); |
} |
void ElementShadow::didDistributeNode(const Node* node, InsertionPoint* insertionPoint) |