| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "core/dom/custom/CustomElementUpgradeCandidateMap.h" | 31 #include "core/dom/custom/V0CustomElementUpgradeCandidateMap.h" |
| 32 | 32 |
| 33 #include "core/dom/Element.h" | 33 #include "core/dom/Element.h" |
| 34 | 34 |
| 35 namespace blink { | 35 namespace blink { |
| 36 | 36 |
| 37 CustomElementUpgradeCandidateMap* CustomElementUpgradeCandidateMap::create() | 37 V0CustomElementUpgradeCandidateMap* V0CustomElementUpgradeCandidateMap::create() |
| 38 { | 38 { |
| 39 return new CustomElementUpgradeCandidateMap(); | 39 return new V0CustomElementUpgradeCandidateMap(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 CustomElementUpgradeCandidateMap::~CustomElementUpgradeCandidateMap() | 42 V0CustomElementUpgradeCandidateMap::~V0CustomElementUpgradeCandidateMap() |
| 43 { | 43 { |
| 44 } | 44 } |
| 45 | 45 |
| 46 void CustomElementUpgradeCandidateMap::add(const CustomElementDescriptor& descri
ptor, Element* element) | 46 void V0CustomElementUpgradeCandidateMap::add(const V0CustomElementDescriptor& de
scriptor, Element* element) |
| 47 { | 47 { |
| 48 observe(element); | 48 observe(element); |
| 49 | 49 |
| 50 UpgradeCandidateMap::AddResult result = m_upgradeCandidates.add(element, des
criptor); | 50 UpgradeCandidateMap::AddResult result = m_upgradeCandidates.add(element, des
criptor); |
| 51 ASSERT_UNUSED(result, result.isNewEntry); | 51 ASSERT_UNUSED(result, result.isNewEntry); |
| 52 | 52 |
| 53 UnresolvedDefinitionMap::iterator it = m_unresolvedDefinitions.find(descript
or); | 53 UnresolvedDefinitionMap::iterator it = m_unresolvedDefinitions.find(descript
or); |
| 54 ElementSet* elements; | 54 ElementSet* elements; |
| 55 if (it == m_unresolvedDefinitions.end()) | 55 if (it == m_unresolvedDefinitions.end()) |
| 56 elements = m_unresolvedDefinitions.add(descriptor, new ElementSet()).sto
redValue->value.get(); | 56 elements = m_unresolvedDefinitions.add(descriptor, new ElementSet()).sto
redValue->value.get(); |
| 57 else | 57 else |
| 58 elements = it->value.get(); | 58 elements = it->value.get(); |
| 59 elements->add(element); | 59 elements->add(element); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void CustomElementUpgradeCandidateMap::elementWasDestroyed(Element* element) | 62 void V0CustomElementUpgradeCandidateMap::elementWasDestroyed(Element* element) |
| 63 { | 63 { |
| 64 CustomElementObserver::elementWasDestroyed(element); | 64 V0CustomElementObserver::elementWasDestroyed(element); |
| 65 UpgradeCandidateMap::iterator candidate = m_upgradeCandidates.find(element); | 65 UpgradeCandidateMap::iterator candidate = m_upgradeCandidates.find(element); |
| 66 ASSERT_WITH_SECURITY_IMPLICATION(candidate != m_upgradeCandidates.end()); | 66 ASSERT_WITH_SECURITY_IMPLICATION(candidate != m_upgradeCandidates.end()); |
| 67 | 67 |
| 68 UnresolvedDefinitionMap::iterator elements = m_unresolvedDefinitions.find(ca
ndidate->value); | 68 UnresolvedDefinitionMap::iterator elements = m_unresolvedDefinitions.find(ca
ndidate->value); |
| 69 ASSERT_WITH_SECURITY_IMPLICATION(elements != m_unresolvedDefinitions.end()); | 69 ASSERT_WITH_SECURITY_IMPLICATION(elements != m_unresolvedDefinitions.end()); |
| 70 elements->value->remove(element); | 70 elements->value->remove(element); |
| 71 m_upgradeCandidates.remove(candidate); | 71 m_upgradeCandidates.remove(candidate); |
| 72 } | 72 } |
| 73 | 73 |
| 74 CustomElementUpgradeCandidateMap::ElementSet* CustomElementUpgradeCandidateMap::
takeUpgradeCandidatesFor(const CustomElementDescriptor& descriptor) | 74 V0CustomElementUpgradeCandidateMap::ElementSet* V0CustomElementUpgradeCandidateM
ap::takeUpgradeCandidatesFor(const V0CustomElementDescriptor& descriptor) |
| 75 { | 75 { |
| 76 ElementSet* candidates = m_unresolvedDefinitions.take(descriptor); | 76 ElementSet* candidates = m_unresolvedDefinitions.take(descriptor); |
| 77 | 77 |
| 78 if (!candidates) | 78 if (!candidates) |
| 79 return nullptr; | 79 return nullptr; |
| 80 | 80 |
| 81 for (const auto& candidate : *candidates) { | 81 for (const auto& candidate : *candidates) { |
| 82 unobserve(candidate); | 82 unobserve(candidate); |
| 83 m_upgradeCandidates.remove(candidate); | 83 m_upgradeCandidates.remove(candidate); |
| 84 } | 84 } |
| 85 return candidates; | 85 return candidates; |
| 86 } | 86 } |
| 87 | 87 |
| 88 DEFINE_TRACE(CustomElementUpgradeCandidateMap) | 88 DEFINE_TRACE(V0CustomElementUpgradeCandidateMap) |
| 89 { | 89 { |
| 90 visitor->trace(m_upgradeCandidates); | 90 visitor->trace(m_upgradeCandidates); |
| 91 visitor->trace(m_unresolvedDefinitions); | 91 visitor->trace(m_unresolvedDefinitions); |
| 92 CustomElementObserver::trace(visitor); | 92 V0CustomElementObserver::trace(visitor); |
| 93 } | 93 } |
| 94 | 94 |
| 95 } // namespace blink | 95 } // namespace blink |
| OLD | NEW |