Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Side by Side Diff: third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp

Issue 1854543002: Oilpan: Remove WillBe types (part 7) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 } 241 }
242 242
243 DEFINE_TRACE(EventHandlerRegistry) 243 DEFINE_TRACE(EventHandlerRegistry)
244 { 244 {
245 visitor->trace(m_frameHost); 245 visitor->trace(m_frameHost);
246 visitor->template registerWeakMembers<EventHandlerRegistry, &EventHandlerReg istry::clearWeakMembers>(this); 246 visitor->template registerWeakMembers<EventHandlerRegistry, &EventHandlerReg istry::clearWeakMembers>(this);
247 } 247 }
248 248
249 void EventHandlerRegistry::clearWeakMembers(Visitor* visitor) 249 void EventHandlerRegistry::clearWeakMembers(Visitor* visitor)
250 { 250 {
251 Vector<RawPtrWillBeUntracedMember<EventTarget>> deadTargets; 251 Vector<UntracedMember<EventTarget>> deadTargets;
252 for (size_t i = 0; i < EventHandlerClassCount; ++i) { 252 for (size_t i = 0; i < EventHandlerClassCount; ++i) {
253 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i); 253 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
254 const EventTargetSet* targets = &m_targets[handlerClass]; 254 const EventTargetSet* targets = &m_targets[handlerClass];
255 for (const auto& eventTarget : *targets) { 255 for (const auto& eventTarget : *targets) {
256 Node* node = eventTarget.key->toNode(); 256 Node* node = eventTarget.key->toNode();
257 LocalDOMWindow* window = eventTarget.key->toDOMWindow(); 257 LocalDOMWindow* window = eventTarget.key->toDOMWindow();
258 if (node && !Heap::isHeapObjectAlive(node)) { 258 if (node && !Heap::isHeapObjectAlive(node)) {
259 deadTargets.append(node); 259 deadTargets.append(node);
260 } else if (window && !Heap::isHeapObjectAlive(window)) { 260 } else if (window && !Heap::isHeapObjectAlive(window)) {
261 deadTargets.append(window); 261 deadTargets.append(window);
262 } 262 }
263 } 263 }
264 } 264 }
265 for (size_t i = 0; i < deadTargets.size(); ++i) 265 for (size_t i = 0; i < deadTargets.size(); ++i)
266 didRemoveAllEventHandlers(*deadTargets[i]); 266 didRemoveAllEventHandlers(*deadTargets[i]);
267 } 267 }
268 268
269 void EventHandlerRegistry::documentDetached(Document& document) 269 void EventHandlerRegistry::documentDetached(Document& document)
270 { 270 {
271 // Remove all event targets under the detached document. 271 // Remove all event targets under the detached document.
272 for (size_t handlerClassIndex = 0; handlerClassIndex < EventHandlerClassCoun t; ++handlerClassIndex) { 272 for (size_t handlerClassIndex = 0; handlerClassIndex < EventHandlerClassCoun t; ++handlerClassIndex) {
273 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(handlerC lassIndex); 273 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(handlerC lassIndex);
274 Vector<RawPtrWillBeUntracedMember<EventTarget>> targetsToRemove; 274 Vector<UntracedMember<EventTarget>> targetsToRemove;
275 const EventTargetSet* targets = &m_targets[handlerClass]; 275 const EventTargetSet* targets = &m_targets[handlerClass];
276 for (const auto& eventTarget : *targets) { 276 for (const auto& eventTarget : *targets) {
277 if (Node* node = eventTarget.key->toNode()) { 277 if (Node* node = eventTarget.key->toNode()) {
278 for (Document* doc = &node->document(); doc; doc = doc->ownerEle ment() ? &doc->ownerElement()->document() : 0) { 278 for (Document* doc = &node->document(); doc; doc = doc->ownerEle ment() ? &doc->ownerElement()->document() : 0) {
279 if (doc == &document) { 279 if (doc == &document) {
280 targetsToRemove.append(eventTarget.key); 280 targetsToRemove.append(eventTarget.key);
281 break; 281 break;
282 } 282 }
283 } 283 }
284 } else if (eventTarget.key->toDOMWindow()) { 284 } else if (eventTarget.key->toDOMWindow()) {
(...skipping 25 matching lines...) Expand all
310 ASSERT(window->frame()); 310 ASSERT(window->frame());
311 ASSERT(window->frame()->host()); 311 ASSERT(window->frame()->host());
312 ASSERT(window->frame()->host() == m_frameHost); 312 ASSERT(window->frame()->host() == m_frameHost);
313 } 313 }
314 } 314 }
315 } 315 }
316 #endif // ENABLE(ASSERT) 316 #endif // ENABLE(ASSERT)
317 } 317 }
318 318
319 } // namespace blink 319 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/EventHandlerRegistry.h ('k') | third_party/WebKit/Source/core/frame/Frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698