Changeset 204499 in webkit

Timestamp:

Aug 15, 2016, 11:48:34 PM (9 years ago)

Author:

Chris Dumez

Message:

Rename RegisteredEventListener::listener() to callback() for clarity
​https://bugs.webkit.org/show_bug.cgi?id=160873

Reviewed by Darin Adler.

Rename RegisteredEventListener::listener() to callback() for clarity
and to match the specification:

• ​https://dom.spec.whatwg.org/#concept-event-listener

Always calling listener->listener() seems wrong.

• bindings/js/JSCommandLineAPIHostCustom.cpp:

(WebCore::getJSListenerFunctions):

• dom/EventListenerMap.cpp:

(WebCore::findListener):
(WebCore::removeFirstListenerCreatedFromMarkup):
(WebCore::copyListenersNotCreatedFromMarkupToTarget):
(WebCore::EventListenerIterator::nextListener):

• dom/EventTarget.cpp:

(WebCore::EventTarget::getAttributeEventListener):
(WebCore::EventTarget::fireEventListeners):

• dom/RegisteredEventListener.h:

(WebCore::RegisteredEventListener::callback):
(WebCore::RegisteredEventListener::RegisteredEventListener):
(WebCore::RegisteredEventListener::listener): Deleted.

• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::getEventListeners):
(WebCore::InspectorDOMAgent::buildObjectForEventListener):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSCommandLineAPIHostCustom.cpp (modified) (1 diff)
• dom/EventListenerMap.cpp (modified) (4 diffs)
• dom/EventTarget.cpp (modified) (3 diffs)
• dom/RegisteredEventListener.h (modified) (3 diffs)
• inspector/InspectorDOMAgent.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-15  Chris Dumez  <cdumez@apple.com>
+
+        Rename RegisteredEventListener::listener() to callback() for clarity
+        https://bugs.webkit.org/show_bug.cgi?id=160873
+
+        Reviewed by Darin Adler.
+
+        Rename RegisteredEventListener::listener() to callback() for clarity
+        and to match the specification:
+        - https://dom.spec.whatwg.org/#concept-event-listener
+
+        Always calling listener->listener() seems wrong.
+
+        * bindings/js/JSCommandLineAPIHostCustom.cpp:
+        (WebCore::getJSListenerFunctions):
+        * dom/EventListenerMap.cpp:
+        (WebCore::findListener):
+        (WebCore::removeFirstListenerCreatedFromMarkup):
+        (WebCore::copyListenersNotCreatedFromMarkupToTarget):
+        (WebCore::EventListenerIterator::nextListener):
+        * dom/EventTarget.cpp:
+        (WebCore::EventTarget::getAttributeEventListener):
+        (WebCore::EventTarget::fireEventListeners):
+        * dom/RegisteredEventListener.h:
+        (WebCore::RegisteredEventListener::callback):
+        (WebCore::RegisteredEventListener::RegisteredEventListener):
+        (WebCore::RegisteredEventListener::listener): Deleted.
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::getEventListeners):
+        (WebCore::InspectorDOMAgent::buildObjectForEventListener):
+
 2016-08-15  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp

@@ -74 +74 @@
     size_t handlersCount = listenerInfo.eventListenerVector.size();
     for (size_t i = 0, outputIndex = 0; i < handlersCount; ++i) {
-        const JSEventListener* jsListener = JSEventListener::cast(&listenerInfo.eventListenerVector[i]->listener());
+        const JSEventListener* jsListener = JSEventListener::cast(&listenerInfo.eventListenerVector[i]->callback());
         if (!jsListener) {
             ASSERT_NOT_REACHED();

trunk/Source/WebCore/dom/EventListenerMap.cpp

@@ -90 +90 @@
     for (size_t i = 0; i < listeners.size(); ++i) {
         auto& registeredListener = listeners[i];
-        if (registeredListener->listener() == listener && registeredListener->useCapture() == useCapture)
+        if (registeredListener->callback() == listener && registeredListener->useCapture() == useCapture)
             return i;
     }
@@ -155 +155 @@
 {
     bool foundListener = listenerVector.removeFirstMatching([] (const auto& registeredListener) {
-        if (registeredListener->listener().wasCreatedFromMarkup()) {
+        if (registeredListener->callback().wasCreatedFromMarkup()) {
             registeredListener->markAsRemoved();
             return true;
@@ -182 +182 @@
     for (auto& registeredListener : listenerVector) {
         // Event listeners created from markup have already been transfered to the shadow tree during cloning.
-        if (registeredListener->listener().wasCreatedFromMarkup())
+        if (registeredListener->callback().wasCreatedFromMarkup())
             continue;
-        target->addEventListener(eventType, registeredListener->listener(), registeredListener->useCapture());
+        target->addEventListener(eventType, registeredListener->callback(), registeredListener->useCapture());
     }
 }
@@ -227 +227 @@
         EventListenerVector& listeners = *m_map->m_entries[m_entryIndex].second;
         if (m_index < listeners.size())
-            return &listeners[m_index++]->listener();
+            return &listeners[m_index++]->callback();
         m_index = 0;
     }

trunk/Source/WebCore/dom/EventTarget.cpp

@@ -117 +117 @@
 {
     for (auto& eventListener : getEventListeners(eventType)) {
-        if (eventListener->listener().isAttribute())
-            return &eventListener->listener();
+        if (eventListener->callback().isAttribute())
+            return &eventListener->callback();
     }
     return nullptr;
@@ -242 +242 @@
         // Do this before invocation to avoid reentrancy issues.
         if (registeredListener->isOnce())
-            removeEventListener(event.type(), registeredListener->listener(), ListenerOptions(registeredListener->useCapture()));
+            removeEventListener(event.type(), registeredListener->callback(), ListenerOptions(registeredListener->useCapture()));
 
         if (registeredListener->isPassive())
@@ -250 +250 @@
         // To match Mozilla, the AT_TARGET phase fires both capturing and bubbling
         // event listeners, even though that violates some versions of the DOM spec.
-        registeredListener->listener().handleEvent(context, &event);
+        registeredListener->callback().handleEvent(context, &event);
         InspectorInstrumentation::didHandleEvent(cookie);
 

trunk/Source/WebCore/dom/RegisteredEventListener.h

@@ -50 +50 @@
     }
 
-    EventListener& listener() const { return const_cast<EventListener&>(m_listener.get()); }
+    EventListener& callback() const { return const_cast<EventListener&>(m_callback.get()); }
     bool useCapture() const { return m_useCapture; }
     bool isPassive() const { return m_isPassive; }
@@ -60 +60 @@
 private:
     RegisteredEventListener(Ref<EventListener>&& listener, const Options& options)
-        : m_listener(WTFMove(listener))
+        : m_callback(WTFMove(listener))
         , m_useCapture(options.capture)
         , m_isPassive(options.passive)
@@ -67 +67 @@
     }
 
-    Ref<EventListener> m_listener;
+    Ref<EventListener> m_callback;
     bool m_useCapture { false };
     bool m_isPassive { false };

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -861 +861 @@
             filteredListeners.reserveInitialCapacity(listeners.size());
             for (auto& listener : listeners) {
-                if (listener->listener().type() == EventListener::JSEventListenerType)
+                if (listener->callback().type() == EventListener::JSEventListenerType)
                     filteredListeners.uncheckedAppend(listener);
             }
@@ -1478 +1478 @@
 Ref<Inspector::Protocol::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, Node* node, const String* objectGroupId)
 {
-    Ref<EventListener> eventListener = registeredEventListener.listener();
+    Ref<EventListener> eventListener = registeredEventListener.callback();
 
     JSC::ExecState* state = nullptr;