Change EventTarget callback APIs for add/RemoveEventListenerInternal.

third_party/WebKit/Source/core/svg/SVGElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 713 matching lines @@
 {
     ASSERT(element);
     if (element->containingShadowRoot())
         return;
 
     ASSERT(!element->instanceUpdatesBlocked());
 
     instances = element->instancesForElement();
 }
 
-bool SVGElement::addEventListenerInternal(const AtomicString& eventType, EventListener* listener, const EventListenerOptions& options)
+void SVGElement::addedEventListener(const AtomicString& eventType, RegisteredEventListener& registeredListener)
 {
     // Add event listener to regular DOM element
-    if (!Node::addEventListenerInternal(eventType, listener, options))
-        return false;
+    Node::addedEventListener(eventType, registeredListener);
 
     // Add event listener to all shadow tree DOM element instances
     HeapHashSet<WeakMember<SVGElement>> instances;
     collectInstancesForSVGElement(this, instances);
+    EventListenerOptions options = registeredListener.options();
+    EventListener* listener = registeredListener.listener();
     for (SVGElement* element : instances) {
         bool result = element->Node::addEventListenerInternal(eventType, listener, options);
         ASSERT_UNUSED(result, result);
     }
-
-    return true;
 }
 
-bool SVGElement::removeEventListenerInternal(const AtomicString& eventType, EventListener* listener, const EventListenerOptions& options)
+void SVGElement::removedEventListener(const AtomicString& eventType, const RegisteredEventListener& registeredListener)
 {
-    // Remove event listener from regular DOM element
-    if (!Node::removeEventListenerInternal(eventType, listener, options))
-        return false;
+    Node::removedEventListener(eventType, registeredListener);
 
     // Remove event listener from all shadow tree DOM element instances
     HeapHashSet<WeakMember<SVGElement>> instances;
     collectInstancesForSVGElement(this, instances);
+    EventListenerOptions options = registeredListener.options();
+    const EventListener* listener = registeredListener.listener();
     for (SVGElement* shadowTreeElement : instances) {
         ASSERT(shadowTreeElement);
 
         shadowTreeElement->Node::removeEventListenerInternal(eventType, listener, options);
     }
-
-    return true;
 }
 
 static bool hasLoadListener(Element* element)
 {
     if (element->hasEventListeners(EventTypeNames::load))
         return true;
 
     for (element = element->parentOrShadowHostElement(); element; element = element->parentOrShadowHostElement()) {
         EventListenerVector* entry = element->getEventListeners(EventTypeNames::load);
         if (!entry)
             continue;
         for (size_t i = 0; i < entry->size(); ++i) {
-            if (entry->at(i).useCapture)
+            if (entry->at(i).capture())
                 return true;
         }
     }
 
     return false;
 }
 
 bool SVGElement::sendSVGLoadEventIfPossible()
 {
     if (!haveLoadedRequiredResources())
@@ skipping 388 matching lines @@
     Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
     return evtString;
 }
 
 } // namespace blink