Add AddEventListenerOptions addEventListenerOptions interface.

third_party/WebKit/Source/core/dom/Node.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, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1764 matching lines @@
             document().addMutationObserverTypes(registry->at(i)->mutationTypes());
         }
     }
 
     if (transientMutationObserverRegistry()) {
         for (MutationObserverRegistration* registration : *transientMutationObserverRegistry())
             document().addMutationObserverTypes(registration->mutationTypes());
     }
 }
 
-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;
 
     document().addListenerTypeIfNeeded(eventType);
     if (FrameHost* frameHost = document().frameHost())
         frameHost->eventHandlerRegistry().didAddEventHandler(*this, eventType, options);
 
     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()
 {
     if (hasEventListeners() && document().frameHost())
         document().frameHost()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
     EventTarget::removeAllEventListeners();
 }
 
 void Node::removeAllEventListenersRecursively()
@@ skipping 514 matching lines @@
 
 void showNodePath(const blink::Node* node)
 {
     if (node)
         node->showNodePathForThis();
     else
         fprintf(stderr, "Cannot showNodePath for (nil)\n");
 }
 
 #endif