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

Side by Side Diff: Source/core/events/EventTarget.cpp

Issue 1233483002: Add counters for add/removeEventListener() called with one argument (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: No [Conditional] support Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/events/EventTarget.h ('k') | Source/core/events/EventTarget.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 6 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
7 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> 7 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 return 0; 80 return 0;
81 } 81 }
82 82
83 inline LocalDOMWindow* EventTarget::executingWindow() 83 inline LocalDOMWindow* EventTarget::executingWindow()
84 { 84 {
85 if (ExecutionContext* context = executionContext()) 85 if (ExecutionContext* context = executionContext())
86 return context->executingWindow(); 86 return context->executingWindow();
87 return 0; 87 return 0;
88 } 88 }
89 89
90 bool EventTarget::addEventListener()
91 {
92 UseCounter::count(executionContext(), UseCounter::AddEventListenerNoArgument s);
93 return false;
94 }
95
96 bool EventTarget::addEventListener(const AtomicString& eventType, PassRefPtr<Eve ntListener> listener, bool useCapture) 90 bool EventTarget::addEventListener(const AtomicString& eventType, PassRefPtr<Eve ntListener> listener, bool useCapture)
97 { 91 {
98 // FIXME: listener null check should throw TypeError (and be done in
99 // generated bindings), but breaks legacy content. http://crbug.com/249598
100 if (!listener) 92 if (!listener)
101 return false; 93 return false;
102 94
103 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLo ggerIfIsolatedWorld(); 95 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLo ggerIfIsolatedWorld();
104 if (activityLogger) { 96 if (activityLogger) {
105 Vector<String> argv; 97 Vector<String> argv;
106 argv.append(toNode() ? toNode()->nodeName() : interfaceName()); 98 argv.append(toNode() ? toNode()->nodeName() : interfaceName());
107 argv.append(eventType); 99 argv.append(eventType);
108 activityLogger->logEvent("blinkAddEventListener", argv.size(), argv.data ()); 100 activityLogger->logEvent("blinkAddEventListener", argv.size(), argv.data ());
109 } 101 }
110 102
111 return ensureEventTargetData().eventListenerMap.add(eventType, listener, use Capture); 103 return ensureEventTargetData().eventListenerMap.add(eventType, listener, use Capture);
112 } 104 }
113 105
114 bool EventTarget::removeEventListener()
115 {
116 UseCounter::count(executionContext(), UseCounter::RemoveEventListenerNoArgum ents);
117 return false;
118 }
119
120 bool EventTarget::removeEventListener(const AtomicString& eventType, PassRefPtr< EventListener> listener, bool useCapture) 106 bool EventTarget::removeEventListener(const AtomicString& eventType, PassRefPtr< EventListener> listener, bool useCapture)
121 { 107 {
122 // FIXME: listener null check should throw TypeError (and be done in
123 // generated bindings), but breaks legacy content. http://crbug.com/249598
124 if (!listener) 108 if (!listener)
125 return false; 109 return false;
126 110
127 EventTargetData* d = eventTargetData(); 111 EventTargetData* d = eventTargetData();
128 if (!d) 112 if (!d)
129 return false; 113 return false;
130 114
131 size_t indexOfRemovedListener; 115 size_t indexOfRemovedListener;
132 116
133 if (!d->eventListenerMap.remove(eventType, listener.get(), useCapture, index OfRemovedListener)) 117 if (!d->eventListenerMap.remove(eventType, listener.get(), useCapture, index OfRemovedListener))
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 // they have one less listener to invoke. 378 // they have one less listener to invoke.
395 if (d->firingEventIterators) { 379 if (d->firingEventIterators) {
396 for (size_t i = 0; i < d->firingEventIterators->size(); ++i) { 380 for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
397 d->firingEventIterators->at(i).iterator = 0; 381 d->firingEventIterators->at(i).iterator = 0;
398 d->firingEventIterators->at(i).end = 0; 382 d->firingEventIterators->at(i).end = 0;
399 } 383 }
400 } 384 }
401 } 385 }
402 386
403 } // namespace blink 387 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/events/EventTarget.h ('k') | Source/core/events/EventTarget.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698