Add AddEventListenerOptions addEventListenerOptions interface.

third_party/WebKit/Source/core/events/EventTarget.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 34 matching lines @@
 #include "wtf/Vector.h"
 
 using namespace WTF;
 
 namespace blink {
 namespace {
 
 void setDefaultEventListenerOptionsLegacy(EventListenerOptions& options, bool useCapture)
 {
     options.setCapture(useCapture);
+}
+
+void setDefaultAddEventListenerOptionsLegacy(AddEventListenerOptions& options, bool useCapture)
+{
+    setDefaultEventListenerOptionsLegacy(options, useCapture);
     options.setPassive(false);
 }
 
 void setDefaultEventListenerOptions(EventListenerOptions& options)
 {
     // The default for capture is based on whether the eventListenerOptions
     // runtime setting is enabled. That is
     // addEventListener('type', function(e) {}, {});
     // behaves differently under the setting. With the setting off
     // capture is true; with the setting on capture is false.
     if (!options.hasCapture())
         options.setCapture(!RuntimeEnabledFeatures::eventListenerOptionsEnabled());
+}
+
+void setDefaultAddEventListenerOptions(AddEventListenerOptions& options)
+{
+    setDefaultEventListenerOptions(options);
     if (!options.hasPassive())
         options.setPassive(false);
 }
 
 } // namespace
 
 EventTargetData::EventTargetData()
 {
 }
 
@@ skipping 41 matching lines @@
 
 inline LocalDOMWindow* EventTarget::executingWindow()
 {
     if (ExecutionContext* context = getExecutionContext())
         return context->executingWindow();
     return nullptr;
 }
 
 bool EventTarget::addEventListener(const AtomicString& eventType, EventListener* listener, bool useCapture)
 {
-    EventListenerOptions options;
-    setDefaultEventListenerOptionsLegacy(options, useCapture);
+    AddEventListenerOptions options;
+    setDefaultAddEventListenerOptionsLegacy(options, useCapture);
     return addEventListenerInternal(eventType, listener, options);
 }
 
-bool EventTarget::addEventListener(const AtomicString& eventType, EventListener* listener, const EventListenerOptionsOrBoolean& optionsUnion)
+bool EventTarget::addEventListener(const AtomicString& eventType, EventListener* listener, const AddEventListenerOptionsOrBoolean& optionsUnion)
 {
     if (optionsUnion.isBoolean())
         return addEventListener(eventType, listener, optionsUnion.getAsBoolean());
-    if (optionsUnion.isEventListenerOptions()) {
-        EventListenerOptions options = optionsUnion.getAsEventListenerOptions();
+    if (optionsUnion.isAddEventListenerOptions()) {
+        AddEventListenerOptions options = optionsUnion.getAsAddEventListenerOptions();
         return addEventListener(eventType, listener, options);
     }
     return addEventListener(eventType, listener);
 }
 
-bool EventTarget::addEventListener(const AtomicString& eventType, EventListener* listener, EventListenerOptions& options)
+bool EventTarget::addEventListener(const AtomicString& eventType, EventListener* listener, AddEventListenerOptions& options)
 {
-    setDefaultEventListenerOptions(options);
+    setDefaultAddEventListenerOptions(options);
     return addEventListenerInternal(eventType, listener, options);
 }
 
-bool EventTarget::addEventListenerInternal(const AtomicString& eventType, EventListener* listener, const EventListenerOptions& options)
+bool EventTarget::addEventListenerInternal(const AtomicString& eventType, EventListener* listener, const AddEventListenerOptions& options)
 {
     if (!listener)
         return false;
 
     V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLoggerIfIsolatedWorld();
     if (activityLogger) {
         Vector<String> argv;
         argv.append(toNode() ? toNode()->nodeName() : interfaceName());
         argv.append(eventType);
         activityLogger->logEvent("blinkAddEventListener", argv.size(), argv.data());
@@ skipping 29 matching lines @@
 bool EventTarget::removeEventListenerInternal(const AtomicString& eventType, EventListener* listener, const EventListenerOptions& options)
 {
     if (!listener)
         return false;
 
     EventTargetData* d = eventTargetData();
     if (!d)
         return false;
 
     size_t indexOfRemovedListener;
+    RegisteredEventListener registeredListener;
 
-    if (!d->eventListenerMap.remove(eventType, listener, options, indexOfRemovedListener))
+    if (!d->eventListenerMap.remove(eventType, listener, options, indexOfRemovedListener, &registeredListener))
         return false;
 
     // Notify firing events planning to invoke the listener at 'index' that
     // they have one less listener to invoke.
-    if (!d->firingEventIterators)
-        return true;
-    for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
-        FiringEventIterator& firingIterator = d->firingEventIterators->at(i);
-        if (eventType != firingIterator.eventType)
-            continue;
+    if (d->firingEventIterators) {
+        for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
+            FiringEventIterator& firingIterator = d->firingEventIterators->at(i);
+            if (eventType != firingIterator.eventType)
+                continue;
 
-        if (indexOfRemovedListener >= firingIterator.end)
-            continue;
+            if (indexOfRemovedListener >= firingIterator.end)
+                continue;
 
-        --firingIterator.end;
-        // Note that when firing an event listener,
-        // firingIterator.iterator indicates the next event listener
-        // that would fire, not the currently firing event
-        // listener. See EventTarget::fireEventListeners.
-        if (indexOfRemovedListener < firingIterator.iterator)
-            --firingIterator.iterator;
+            --firingIterator.end;
+            // Note that when firing an event listener,
+            // firingIterator.iterator indicates the next event listener
+            // that would fire, not the currently firing event
+            // listener. See EventTarget::fireEventListeners.
+            if (indexOfRemovedListener < firingIterator.iterator)
+                --firingIterator.iterator;
+        }
     }
+    removedEventListener(eventType, registeredListener);
+    return true;
+}
 
-    return true;
+void EventTarget::removedEventListener(const AtomicString& eventType, const RegisteredEventListener& registeredListener)
+{
 }
 
 bool EventTarget::setAttributeEventListener(const AtomicString& eventType, EventListener* listener)
 {
     clearAttributeEventListener(eventType);
     if (!listener)
         return false;
     return addEventListener(eventType, listener, false);
 }
 
@@ skipping 254 matching lines @@
     // they have one less listener to invoke.
     if (d->firingEventIterators) {
         for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
             d->firingEventIterators->at(i).iterator = 0;
             d->firingEventIterators->at(i).end = 0;
         }
     }
 }
 
 } // namespace blink