Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 87 return context->executingWindow(); | 87 return context->executingWindow(); |
| 88 return 0; | 88 return 0; |
| 89 } | 89 } |
| 90 | 90 |
| 91 bool EventTarget::addEventListener() | 91 bool EventTarget::addEventListener() |
| 92 { | 92 { |
| 93 UseCounter::count(executionContext(), UseCounter::AddEventListenerNoArgument s); | 93 UseCounter::count(executionContext(), UseCounter::AddEventListenerNoArgument s); |
| 94 return false; | 94 return false; |
| 95 } | 95 } |
| 96 | 96 |
| 97 bool EventTarget::addEventListener(const AtomicString& eventType) | |
| 98 { | |
| 99 UseCounter::count(executionContext(), UseCounter::AddEventListenerOneArgumen t); | |
|
pdr.
2015/02/16 19:57:32
Can you remove this entry from UseCounter.h as wel
Timothy Loh
2015/02/16 23:21:12
Done.
| |
| 100 return false; | |
| 101 } | |
| 102 | |
| 103 bool EventTarget::addEventListener(const AtomicString& eventType, PassRefPtr<Eve ntListener> listener, bool useCapture) | 97 bool EventTarget::addEventListener(const AtomicString& eventType, PassRefPtr<Eve ntListener> listener, bool useCapture) |
| 104 { | 98 { |
| 105 // FIXME: listener null check should throw TypeError (and be done in | 99 // FIXME: listener null check should throw TypeError (and be done in |
| 106 // generated bindings), but breaks legacy content. http://crbug.com/249598 | 100 // generated bindings), but breaks legacy content. http://crbug.com/249598 |
| 107 if (!listener) | 101 if (!listener) |
| 108 return false; | 102 return false; |
| 109 | 103 |
| 110 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLo ggerIfIsolatedWorld(); | 104 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLo ggerIfIsolatedWorld(); |
| 111 if (activityLogger) { | 105 if (activityLogger) { |
| 112 Vector<String> argv; | 106 Vector<String> argv; |
| 113 argv.append(toNode() ? toNode()->nodeName() : interfaceName()); | 107 argv.append(toNode() ? toNode()->nodeName() : interfaceName()); |
| 114 argv.append(eventType); | 108 argv.append(eventType); |
| 115 activityLogger->logEvent("blinkAddEventListener", argv.size(), argv.data ()); | 109 activityLogger->logEvent("blinkAddEventListener", argv.size(), argv.data ()); |
| 116 } | 110 } |
| 117 | 111 |
| 118 return ensureEventTargetData().eventListenerMap.add(eventType, listener, use Capture); | 112 return ensureEventTargetData().eventListenerMap.add(eventType, listener, use Capture); |
| 119 } | 113 } |
| 120 | 114 |
| 121 bool EventTarget::removeEventListener() | 115 bool EventTarget::removeEventListener() |
| 122 { | 116 { |
| 123 UseCounter::count(executionContext(), UseCounter::RemoveEventListenerNoArgum ents); | 117 UseCounter::count(executionContext(), UseCounter::RemoveEventListenerNoArgum ents); |
| 124 return false; | 118 return false; |
| 125 } | 119 } |
| 126 | 120 |
| 127 bool EventTarget::removeEventListener(const AtomicString& eventType) | |
| 128 { | |
| 129 UseCounter::count(executionContext(), UseCounter::RemoveEventListenerOneArgu ment); | |
|
pdr.
2015/02/16 19:57:32
Can you remove this entry from UseCounter.h as wel
| |
| 130 return false; | |
| 131 } | |
| 132 | |
| 133 bool EventTarget::removeEventListener(const AtomicString& eventType, PassRefPtr< EventListener> listener, bool useCapture) | 121 bool EventTarget::removeEventListener(const AtomicString& eventType, PassRefPtr< EventListener> listener, bool useCapture) |
| 134 { | 122 { |
| 135 // FIXME: listener null check should throw TypeError (and be done in | 123 // FIXME: listener null check should throw TypeError (and be done in |
| 136 // generated bindings), but breaks legacy content. http://crbug.com/249598 | 124 // generated bindings), but breaks legacy content. http://crbug.com/249598 |
| 137 if (!listener) | 125 if (!listener) |
| 138 return false; | 126 return false; |
| 139 | 127 |
| 140 EventTargetData* d = eventTargetData(); | 128 EventTargetData* d = eventTargetData(); |
| 141 if (!d) | 129 if (!d) |
| 142 return false; | 130 return false; |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 411 // they have one less listener to invoke. | 399 // they have one less listener to invoke. |
| 412 if (d->firingEventIterators) { | 400 if (d->firingEventIterators) { |
| 413 for (size_t i = 0; i < d->firingEventIterators->size(); ++i) { | 401 for (size_t i = 0; i < d->firingEventIterators->size(); ++i) { |
| 414 d->firingEventIterators->at(i).iterator = 0; | 402 d->firingEventIterators->at(i).iterator = 0; |
| 415 d->firingEventIterators->at(i).end = 0; | 403 d->firingEventIterators->at(i).end = 0; |
| 416 } | 404 } |
| 417 } | 405 } |
| 418 } | 406 } |
| 419 | 407 |
| 420 } // namespace blink | 408 } // namespace blink |
| OLD | NEW |