Chromium Code Reviews| 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 3e43b8906d23964d9cdad9f145e7bdffaaf6aec2..ce7e53851a2c6e8f4df3ece86abd9c36fc609b00 100644 |
| --- a/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp |
| +++ b/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp |
| @@ -25,6 +25,11 @@ static void detachNotAssignedNode(Node& node) |
| node.lazyReattachIfAttached(); |
| } |
| +inline static bool defaultSlotName(const AtomicString& name) |
|
tkent
2016/03/04 03:37:47
Such predicate function should be named as "isDefa
hayato
2016/03/04 05:19:45
Done
|
| +{ |
| + return name.isNull() || name.isEmpty(); |
| +} |
| + |
| void SlotAssignment::resolveAssignment(ShadowRoot& shadowRoot) |
| { |
| m_assignment.clear(); |
| @@ -38,7 +43,7 @@ void SlotAssignment::resolveAssignment(ShadowRoot& shadowRoot) |
| for (RefPtrWillBeMember<HTMLSlotElement> slot : slots) { |
| slot->clearDistribution(); |
| AtomicString name = slot->fastGetAttribute(HTMLNames::nameAttr); |
| - if (name.isNull() || name.isEmpty()) { |
| + if (defaultSlotName(name)) { |
| if (!defaultSlot) |
| defaultSlot = slot.get(); |
| } else { |
| @@ -54,7 +59,7 @@ void SlotAssignment::resolveAssignment(ShadowRoot& shadowRoot) |
| continue; |
| } |
| AtomicString slotName = toElement(child).fastGetAttribute(HTMLNames::slotAttr); |
| - if (slotName.isNull() || slotName.isEmpty()) { |
| + if (defaultSlotName(slotName)) { |
| if (defaultSlot) |
| assign(child, *defaultSlot); |
| else |