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

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

Issue 815503002: Add counters for addEventListener/removeEventListener optional arguments (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years 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/frame/UseCounter.h » ('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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 return 0; 81 return 0;
82 } 82 }
83 83
84 inline LocalDOMWindow* EventTarget::executingWindow() 84 inline LocalDOMWindow* EventTarget::executingWindow()
85 { 85 {
86 if (ExecutionContext* context = executionContext()) 86 if (ExecutionContext* context = executionContext())
87 return context->executingWindow(); 87 return context->executingWindow();
88 return 0; 88 return 0;
89 } 89 }
90 90
91 bool EventTarget::addEventListener()
92 {
93 UseCounter::count(executionContext(), UseCounter::AddEventListenerNoArgument s);
94 return false;
95 }
96
97 bool EventTarget::addEventListener(const AtomicString& eventType)
98 {
99 UseCounter::count(executionContext(), UseCounter::AddEventListenerOneArgumen t);
100 return false;
101 }
102
91 bool EventTarget::addEventListener(const AtomicString& eventType, PassRefPtr<Eve ntListener> listener, bool useCapture) 103 bool EventTarget::addEventListener(const AtomicString& eventType, PassRefPtr<Eve ntListener> listener, bool useCapture)
92 { 104 {
93 // FIXME: listener null check should throw TypeError (and be done in 105 // FIXME: listener null check should throw TypeError (and be done in
94 // generated bindings), but breaks legacy content. http://crbug.com/249598 106 // generated bindings), but breaks legacy content. http://crbug.com/249598
95 if (!listener) 107 if (!listener)
96 return false; 108 return false;
97 109
98 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLo ggerIfIsolatedWorld(); 110 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLo ggerIfIsolatedWorld();
99 if (activityLogger) { 111 if (activityLogger) {
100 Vector<String> argv; 112 Vector<String> argv;
101 argv.append(toNode() ? toNode()->nodeName() : interfaceName()); 113 argv.append(toNode() ? toNode()->nodeName() : interfaceName());
102 argv.append(eventType); 114 argv.append(eventType);
103 activityLogger->logEvent("blinkAddEventListener", argv.size(), argv.data ()); 115 activityLogger->logEvent("blinkAddEventListener", argv.size(), argv.data ());
104 } 116 }
105 117
106 return ensureEventTargetData().eventListenerMap.add(eventType, listener, use Capture); 118 return ensureEventTargetData().eventListenerMap.add(eventType, listener, use Capture);
107 } 119 }
108 120
121 bool EventTarget::removeEventListener()
122 {
123 UseCounter::count(executionContext(), UseCounter::RemoveEventListenerNoArgum ents);
124 return false;
125 }
126
127 bool EventTarget::removeEventListener(const AtomicString& eventType)
128 {
129 UseCounter::count(executionContext(), UseCounter::RemoveEventListenerOneArgu ment);
130 return false;
131 }
132
109 bool EventTarget::removeEventListener(const AtomicString& eventType, PassRefPtr< EventListener> listener, bool useCapture) 133 bool EventTarget::removeEventListener(const AtomicString& eventType, PassRefPtr< EventListener> listener, bool useCapture)
110 { 134 {
111 // FIXME: listener null check should throw TypeError (and be done in 135 // FIXME: listener null check should throw TypeError (and be done in
112 // generated bindings), but breaks legacy content. http://crbug.com/249598 136 // generated bindings), but breaks legacy content. http://crbug.com/249598
113 if (!listener) 137 if (!listener)
114 return false; 138 return false;
115 139
116 EventTargetData* d = eventTargetData(); 140 EventTargetData* d = eventTargetData();
117 if (!d) 141 if (!d)
118 return false; 142 return false;
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 // they have one less listener to invoke. 411 // they have one less listener to invoke.
388 if (d->firingEventIterators) { 412 if (d->firingEventIterators) {
389 for (size_t i = 0; i < d->firingEventIterators->size(); ++i) { 413 for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
390 d->firingEventIterators->at(i).iterator = 0; 414 d->firingEventIterators->at(i).iterator = 0;
391 d->firingEventIterators->at(i).end = 0; 415 d->firingEventIterators->at(i).end = 0;
392 } 416 }
393 } 417 }
394 } 418 }
395 419
396 } // namespace blink 420 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/events/EventTarget.h ('k') | Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698