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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 V0CustomElementUpgradeCandidateMap::ElementSet* | 76 V0CustomElementUpgradeCandidateMap::ElementSet* |
77 V0CustomElementUpgradeCandidateMap::takeUpgradeCandidatesFor( | 77 V0CustomElementUpgradeCandidateMap::takeUpgradeCandidatesFor( |
78 const V0CustomElementDescriptor& descriptor) { | 78 const V0CustomElementDescriptor& descriptor) { |
79 ElementSet* candidates = m_unresolvedDefinitions.take(descriptor); | 79 ElementSet* candidates = m_unresolvedDefinitions.take(descriptor); |
80 | 80 |
81 if (!candidates) | 81 if (!candidates) |
82 return nullptr; | 82 return nullptr; |
83 | 83 |
84 for (const auto& candidate : *candidates) { | 84 for (const auto& candidate : *candidates) { |
85 unobserve(candidate); | 85 unobserve(candidate); |
86 m_upgradeCandidates.remove(candidate); | 86 m_upgradeCandidates.erase(candidate); |
87 } | 87 } |
88 return candidates; | 88 return candidates; |
89 } | 89 } |
90 | 90 |
91 DEFINE_TRACE(V0CustomElementUpgradeCandidateMap) { | 91 DEFINE_TRACE(V0CustomElementUpgradeCandidateMap) { |
92 visitor->trace(m_upgradeCandidates); | 92 visitor->trace(m_upgradeCandidates); |
93 visitor->trace(m_unresolvedDefinitions); | 93 visitor->trace(m_unresolvedDefinitions); |
94 V0CustomElementObserver::trace(visitor); | 94 V0CustomElementObserver::trace(visitor); |
95 } | 95 } |
96 | 96 |
97 } // namespace blink | 97 } // namespace blink |
OLD | NEW |