Add AddEventListenerOptions addEventListenerOptions interface.

third_party/WebKit/Source/core/dom/Node.cpp

Index: third_party/WebKit/Source/core/dom/Node.cpp
diff --git a/third_party/WebKit/Source/core/dom/Node.cpp b/third_party/WebKit/Source/core/dom/Node.cpp
index d931b496bd20ef11cbcad99442b624d6c6ef83d8..cf330b8967d225e7343bbce660b853932986b189 100644
--- a/third_party/WebKit/Source/core/dom/Node.cpp
+++ b/third_party/WebKit/Source/core/dom/Node.cpp
@@ -1782,7 +1782,7 @@ void Node::didMoveToNewDocument(Document& oldDocument)
     }
 }
 
-bool Node::addEventListenerInternal(const AtomicString& eventType, EventListener* listener, const EventListenerOptions& options)
+bool Node::addEventListenerInternal(const AtomicString& eventType, EventListener* listener, const AddEventListenerOptions& options)
 {
     if (!EventTarget::addEventListenerInternal(eventType, listener, options))
         return false;
@@ -1794,17 +1794,12 @@ bool Node::addEventListenerInternal(const AtomicString& eventType, EventListener
     return true;
 }
 
-bool Node::removeEventListenerInternal(const AtomicString& eventType, EventListener* listener, const EventListenerOptions& options)
+void Node::removedEventListener(const AtomicString& eventType, const RegisteredEventListener& registeredListener)

[bokan, 2016/04/26 19:54:59]

Could you do this for all the other removeEventListenerInternal and
addEventListenerInternal overrides? I can see NetworkInformation, SVGElement,
and LocalDOMWindow for remove and more for add. All these overrides basically
just want to tack on some extra actions after the add/removal so there's no
sense in allowing them to actually change how listeners are added/removed. In a
few cases some of the addListener overrides do something before adding but after
a quick look I think all of these could/should be done after (and only if the
listener actually got added).

Once that's done you could actually make the remove/addInternal methods private,
or just fold them into the public remove/add methods.

This should probably happen in a separate CL, either before or after this one.

 {
-    if (!EventTarget::removeEventListenerInternal(eventType, listener, options))
-        return false;
-
     // FIXME: Notify Document that the listener has vanished. We need to keep track of a number of
     // listeners for each type, not just a bool - see https://bugs.webkit.org/show_bug.cgi?id=33861
     if (FrameHost* frameHost = document().frameHost())
-        frameHost->eventHandlerRegistry().didRemoveEventHandler(*this, eventType, options);
-
-    return true;
+        frameHost->eventHandlerRegistry().didRemoveEventHandler(*this, eventType, registeredListener.options());
 }
 
 void Node::removeAllEventListeners()