| Index: third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp b/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp
|
| index b5fed59b881b23561c5d6f9185e3742f14139b20..284d80c7467e051201ed571117bb034697fe59d8 100644
|
| --- a/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp
|
| @@ -107,27 +107,19 @@ SlotAssignment::SlotAssignment(ShadowRoot& owner)
|
| {
|
| }
|
|
|
| -static void detachNotAssignedNode(Node& node)
|
| -{
|
| - if (node.layoutObject())
|
| - node.lazyReattachIfAttached();
|
| -}
|
| -
|
| void SlotAssignment::resolveAssignment()
|
| {
|
| for (Member<HTMLSlotElement> slot : slots())
|
| slot->clearDistribution();
|
|
|
| for (Node& child : NodeTraversal::childrenOf(m_owner->host())) {
|
| - if (!child.isSlotable()) {
|
| - detachNotAssignedNode(child);
|
| + if (child.layoutObject())
|
| + child.lazyReattachIfAttached();
|
| + if (!child.isSlotable())
|
| continue;
|
| - }
|
| HTMLSlotElement* slot = findSlotByName(child.slotName());
|
| if (slot)
|
| slot->appendAssignedNode(child);
|
| - else
|
| - detachNotAssignedNode(child);
|
| }
|
| }
|
|
|
|
|