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 23 matching lines...) Expand all Loading... |
34 | 34 |
35 namespace blink { | 35 namespace blink { |
36 | 36 |
37 CustomElementUpgradeCandidateMap* CustomElementUpgradeCandidateMap::create() | 37 CustomElementUpgradeCandidateMap* CustomElementUpgradeCandidateMap::create() |
38 { | 38 { |
39 return new CustomElementUpgradeCandidateMap(); | 39 return new CustomElementUpgradeCandidateMap(); |
40 } | 40 } |
41 | 41 |
42 CustomElementUpgradeCandidateMap::~CustomElementUpgradeCandidateMap() | 42 CustomElementUpgradeCandidateMap::~CustomElementUpgradeCandidateMap() |
43 { | 43 { |
44 #if !ENABLE(OILPAN) | |
45 // With Oilpan enabled, the observer table keeps a weak reference to the | |
46 // element; no need for explicit removal. | |
47 UpgradeCandidateMap::const_iterator::KeysIterator end = m_upgradeCandidates.
end().keys(); | |
48 for (UpgradeCandidateMap::const_iterator::KeysIterator it = m_upgradeCandida
tes.begin().keys(); it != end; ++it) | |
49 unobserve(*it); | |
50 #endif | |
51 } | 44 } |
52 | 45 |
53 void CustomElementUpgradeCandidateMap::add(const CustomElementDescriptor& descri
ptor, Element* element) | 46 void CustomElementUpgradeCandidateMap::add(const CustomElementDescriptor& descri
ptor, Element* element) |
54 { | 47 { |
55 observe(element); | 48 observe(element); |
56 | 49 |
57 UpgradeCandidateMap::AddResult result = m_upgradeCandidates.add(element, des
criptor); | 50 UpgradeCandidateMap::AddResult result = m_upgradeCandidates.add(element, des
criptor); |
58 ASSERT_UNUSED(result, result.isNewEntry); | 51 ASSERT_UNUSED(result, result.isNewEntry); |
59 | 52 |
60 UnresolvedDefinitionMap::iterator it = m_unresolvedDefinitions.find(descript
or); | 53 UnresolvedDefinitionMap::iterator it = m_unresolvedDefinitions.find(descript
or); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 } | 86 } |
94 | 87 |
95 DEFINE_TRACE(CustomElementUpgradeCandidateMap) | 88 DEFINE_TRACE(CustomElementUpgradeCandidateMap) |
96 { | 89 { |
97 visitor->trace(m_upgradeCandidates); | 90 visitor->trace(m_upgradeCandidates); |
98 visitor->trace(m_unresolvedDefinitions); | 91 visitor->trace(m_unresolvedDefinitions); |
99 CustomElementObserver::trace(visitor); | 92 CustomElementObserver::trace(visitor); |
100 } | 93 } |
101 | 94 |
102 } // namespace blink | 95 } // namespace blink |
OLD | NEW |