Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/dom/shadow/SlotAssignment.h" | 5 #include "core/dom/shadow/SlotAssignment.h" |
| 6 | 6 |
| 7 #include "core/HTMLNames.h" | 7 #include "core/HTMLNames.h" |
| 8 #include "core/dom/ElementTraversal.h" | 8 #include "core/dom/ElementTraversal.h" |
| 9 #include "core/dom/NodeTraversal.h" | 9 #include "core/dom/NodeTraversal.h" |
| 10 #include "core/dom/shadow/ElementShadow.h" | 10 #include "core/dom/shadow/ElementShadow.h" |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 void SlotAssignment::resolveAssignment(ShadowRoot& shadowRoot) | 28 void SlotAssignment::resolveAssignment(ShadowRoot& shadowRoot) |
| 29 { | 29 { |
| 30 m_assignment.clear(); | 30 m_assignment.clear(); |
| 31 | 31 |
| 32 using Name2Slot = HeapHashMap<AtomicString, Member<HTMLSlotElement>>; | 32 using Name2Slot = HeapHashMap<AtomicString, Member<HTMLSlotElement>>; |
| 33 Name2Slot name2slot; | 33 Name2Slot name2slot; |
| 34 | 34 |
| 35 const HeapVector<Member<HTMLSlotElement>>& slots = shadowRoot.descendantSlot s(); | 35 const HeapVector<Member<HTMLSlotElement>>& slots = shadowRoot.descendantSlot s(); |
| 36 | 36 |
| 37 for (Member<HTMLSlotElement> slot : slots) { | 37 for (Member<HTMLSlotElement> slot : slots) { |
| 38 slot->willUpdateDistribution(); | 38 slot->willUpdateAssignment(); |
| 39 slot->willUpdateFallback(); | |
| 39 name2slot.add(slot->name(), slot.get()); | 40 name2slot.add(slot->name(), slot.get()); |
| 40 } | 41 } |
| 41 | 42 |
| 42 for (Node& child : NodeTraversal::childrenOf(*shadowRoot.host())) { | 43 for (Node& child : NodeTraversal::childrenOf(*shadowRoot.host())) { |
| 43 if (child.isInsertionPoint()) { | 44 if (child.isInsertionPoint()) { |
| 44 // A re-distribution across v0 and v1 shadow trees is not supported. | 45 // A re-distribution across v0 and v1 shadow trees is not supported. |
| 45 detachNotAssignedNode(child); | 46 detachNotAssignedNode(child); |
| 46 continue; | 47 continue; |
| 47 } | 48 } |
| 48 if (!child.slottable()) { | 49 if (!child.slottable()) { |
| 49 detachNotAssignedNode(child); | 50 detachNotAssignedNode(child); |
| 50 continue; | 51 continue; |
| 51 } | 52 } |
| 52 AtomicString slotName = child.slotName(); | 53 AtomicString slotName = child.slotName(); |
| 53 HTMLSlotElement* slot = name2slot.get(slotName); | 54 HTMLSlotElement* slot = name2slot.get(slotName); |
| 54 if (slot) | 55 if (slot) |
| 55 assign(child, *slot); | 56 assign(child, *slot); |
| 56 else | 57 else |
| 57 detachNotAssignedNode(child); | 58 detachNotAssignedNode(child); |
| 58 } | 59 } |
| 59 | 60 |
| 61 for (auto slot = slots.rbegin(); slot != slots.rend(); ++slot) | |
| 62 (*slot)->updateFallbackNodes(); | |
| 63 | |
| 64 // For each slot, check if assigned nodes have changed | |
| 65 // If so, call fireSlotchange function | |
| 66 for (const auto& slot : slots) | |
| 67 slot->didUpdateAssignment(); | |
| 68 } | |
| 69 | |
| 70 void SlotAssignment::resolveDistribution(ShadowRoot& shadowRoot) | |
| 71 { | |
| 72 | |
| 73 using Name2Slot = HeapHashMap<AtomicString, Member<HTMLSlotElement>>; | |
| 74 Name2Slot name2slot; | |
|
hayato
2016/04/18 07:16:31
resolveDistribution does not need `name2slot`.
yuzuchan
2016/04/18 09:43:27
Done.
| |
| 75 | |
| 76 const HeapVector<Member<HTMLSlotElement>>& slots = shadowRoot.descendantSlot s(); | |
| 77 | |
| 78 for (Member<HTMLSlotElement> slot : slots) { | |
| 79 slot->willUpdateDistribution(); | |
| 80 name2slot.add(slot->name(), slot.get()); | |
| 81 } | |
| 82 | |
| 83 for (auto slot : slots) { | |
| 84 for (auto node : slot->assignedNodes()) | |
| 85 distribute(*node, *slot); | |
| 86 } | |
| 87 | |
| 60 // Update each slot's distribution in reverse tree order so that a child slo t is visited before its parent slot. | 88 // Update each slot's distribution in reverse tree order so that a child slo t is visited before its parent slot. |
| 61 for (auto slot = slots.rbegin(); slot != slots.rend(); ++slot) | 89 for (auto slot = slots.rbegin(); slot != slots.rend(); ++slot) |
| 62 (*slot)->updateDistributedNodesWithFallback(); | 90 (*slot)->updateDistributedNodesWithFallback(); |
| 63 for (const auto& slot : slots) | 91 for (const auto& slot : slots) |
| 64 slot->didUpdateDistribution(); | 92 slot->didUpdateDistribution(); |
| 65 } | 93 } |
| 66 | 94 |
| 67 void SlotAssignment::assign(Node& hostChild, HTMLSlotElement& slot) | 95 void SlotAssignment::assign(Node& hostChild, HTMLSlotElement& slot) |
| 68 { | 96 { |
| 69 DCHECK(hostChild.isSlotAssignable()); | 97 DCHECK(hostChild.isSlotAssignable()); |
| 70 m_assignment.add(&hostChild, &slot); | 98 m_assignment.add(&hostChild, &slot); |
| 71 slot.appendAssignedNode(hostChild); | 99 slot.appendAssignedNode(hostChild); |
| 100 } | |
| 101 | |
| 102 void SlotAssignment::distribute(Node& hostChild, HTMLSlotElement& slot) | |
| 103 { | |
| 104 DCHECK(hostChild.isSlotAssignable()); | |
| 72 if (isHTMLSlotElement(hostChild)) | 105 if (isHTMLSlotElement(hostChild)) |
| 73 slot.appendDistributedNodesFrom(toHTMLSlotElement(hostChild)); | 106 slot.appendDistributedNodesFrom(toHTMLSlotElement(hostChild)); |
| 74 else | 107 else |
| 75 slot.appendDistributedNode(hostChild); | 108 slot.appendDistributedNode(hostChild); |
| 109 | |
| 76 if (slot.isChildOfV1ShadowHost()) | 110 if (slot.isChildOfV1ShadowHost()) |
| 77 slot.parentElementShadow()->setNeedsDistributionRecalc(); | 111 slot.parentElementShadow()->setNeedsDistributionRecalc(); |
| 78 } | 112 } |
| 79 | 113 |
| 80 DEFINE_TRACE(SlotAssignment) | 114 DEFINE_TRACE(SlotAssignment) |
| 81 { | 115 { |
| 82 visitor->trace(m_assignment); | 116 visitor->trace(m_assignment); |
| 83 } | 117 } |
| 84 | 118 |
| 85 } // namespace blink | 119 } // namespace blink |
| OLD | NEW |