| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/frame/EventHandlerRegistry.h" | 5 #include "core/frame/EventHandlerRegistry.h" |
| 6 | 6 |
| 7 #include "core/events/EventListenerOptions.h" | 7 #include "core/events/EventListenerOptions.h" |
| 8 #include "core/frame/LocalDOMWindow.h" | 8 #include "core/frame/LocalDOMWindow.h" |
| 9 #include "core/frame/LocalFrame.h" | 9 #include "core/frame/LocalFrame.h" |
| 10 #include "core/html/HTMLFrameOwnerElement.h" | 10 #include "core/html/HTMLFrameOwnerElement.h" |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 } | 239 } |
| 240 | 240 |
| 241 DEFINE_TRACE(EventHandlerRegistry) | 241 DEFINE_TRACE(EventHandlerRegistry) |
| 242 { | 242 { |
| 243 visitor->trace(m_frameHost); | 243 visitor->trace(m_frameHost); |
| 244 visitor->template registerWeakMembers<EventHandlerRegistry, &EventHandlerReg
istry::clearWeakMembers>(this); | 244 visitor->template registerWeakMembers<EventHandlerRegistry, &EventHandlerReg
istry::clearWeakMembers>(this); |
| 245 } | 245 } |
| 246 | 246 |
| 247 void EventHandlerRegistry::clearWeakMembers(Visitor* visitor) | 247 void EventHandlerRegistry::clearWeakMembers(Visitor* visitor) |
| 248 { | 248 { |
| 249 Vector<RawPtrWillBeUntracedMember<EventTarget>> deadTargets; | 249 Vector<UntracedMember<EventTarget>> deadTargets; |
| 250 for (size_t i = 0; i < EventHandlerClassCount; ++i) { | 250 for (size_t i = 0; i < EventHandlerClassCount; ++i) { |
| 251 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i); | 251 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i); |
| 252 const EventTargetSet* targets = &m_targets[handlerClass]; | 252 const EventTargetSet* targets = &m_targets[handlerClass]; |
| 253 for (const auto& eventTarget : *targets) { | 253 for (const auto& eventTarget : *targets) { |
| 254 Node* node = eventTarget.key->toNode(); | 254 Node* node = eventTarget.key->toNode(); |
| 255 LocalDOMWindow* window = eventTarget.key->toDOMWindow(); | 255 LocalDOMWindow* window = eventTarget.key->toDOMWindow(); |
| 256 if (node && !Heap::isHeapObjectAlive(node)) { | 256 if (node && !Heap::isHeapObjectAlive(node)) { |
| 257 deadTargets.append(node); | 257 deadTargets.append(node); |
| 258 } else if (window && !Heap::isHeapObjectAlive(window)) { | 258 } else if (window && !Heap::isHeapObjectAlive(window)) { |
| 259 deadTargets.append(window); | 259 deadTargets.append(window); |
| 260 } | 260 } |
| 261 } | 261 } |
| 262 } | 262 } |
| 263 for (size_t i = 0; i < deadTargets.size(); ++i) | 263 for (size_t i = 0; i < deadTargets.size(); ++i) |
| 264 didRemoveAllEventHandlers(*deadTargets[i]); | 264 didRemoveAllEventHandlers(*deadTargets[i]); |
| 265 } | 265 } |
| 266 | 266 |
| 267 void EventHandlerRegistry::documentDetached(Document& document) | 267 void EventHandlerRegistry::documentDetached(Document& document) |
| 268 { | 268 { |
| 269 // Remove all event targets under the detached document. | 269 // Remove all event targets under the detached document. |
| 270 for (size_t handlerClassIndex = 0; handlerClassIndex < EventHandlerClassCoun
t; ++handlerClassIndex) { | 270 for (size_t handlerClassIndex = 0; handlerClassIndex < EventHandlerClassCoun
t; ++handlerClassIndex) { |
| 271 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(handlerC
lassIndex); | 271 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(handlerC
lassIndex); |
| 272 Vector<RawPtrWillBeUntracedMember<EventTarget>> targetsToRemove; | 272 Vector<UntracedMember<EventTarget>> targetsToRemove; |
| 273 const EventTargetSet* targets = &m_targets[handlerClass]; | 273 const EventTargetSet* targets = &m_targets[handlerClass]; |
| 274 for (const auto& eventTarget : *targets) { | 274 for (const auto& eventTarget : *targets) { |
| 275 if (Node* node = eventTarget.key->toNode()) { | 275 if (Node* node = eventTarget.key->toNode()) { |
| 276 for (Document* doc = &node->document(); doc; doc = doc->ownerEle
ment() ? &doc->ownerElement()->document() : 0) { | 276 for (Document* doc = &node->document(); doc; doc = doc->ownerEle
ment() ? &doc->ownerElement()->document() : 0) { |
| 277 if (doc == &document) { | 277 if (doc == &document) { |
| 278 targetsToRemove.append(eventTarget.key); | 278 targetsToRemove.append(eventTarget.key); |
| 279 break; | 279 break; |
| 280 } | 280 } |
| 281 } | 281 } |
| 282 } else if (eventTarget.key->toDOMWindow()) { | 282 } else if (eventTarget.key->toDOMWindow()) { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 308 ASSERT(window->frame()); | 308 ASSERT(window->frame()); |
| 309 ASSERT(window->frame()->host()); | 309 ASSERT(window->frame()->host()); |
| 310 ASSERT(window->frame()->host() == m_frameHost); | 310 ASSERT(window->frame()->host() == m_frameHost); |
| 311 } | 311 } |
| 312 } | 312 } |
| 313 } | 313 } |
| 314 #endif // ENABLE(ASSERT) | 314 #endif // ENABLE(ASSERT) |
| 315 } | 315 } |
| 316 | 316 |
| 317 } // namespace blink | 317 } // namespace blink |
| OLD | NEW |