- Revision
- 204499
- Author
- [email protected]
- Date
- 2016-08-15 23:48:34 -0700 (Mon, 15 Aug 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (204498 => 204499)
--- trunk/Source/WebCore/ChangeLog 2016-08-16 06:41:33 UTC (rev 204498)
+++ trunk/Source/WebCore/ChangeLog 2016-08-16 06:48:34 UTC (rev 204499)
@@ -1,5 +1,36 @@
2016-08-15 Chris Dumez <[email protected]>
+ 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 <[email protected]>
+
Add support for dictionary members of non nullable wrapper types
https://bugs.webkit.org/show_bug.cgi?id=160876
Modified: trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp (204498 => 204499)
--- trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp 2016-08-16 06:41:33 UTC (rev 204498)
+++ trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp 2016-08-16 06:48:34 UTC (rev 204499)
@@ -73,7 +73,7 @@
return nullptr;
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();
continue;
Modified: trunk/Source/WebCore/dom/EventListenerMap.cpp (204498 => 204499)
--- trunk/Source/WebCore/dom/EventListenerMap.cpp 2016-08-16 06:41:33 UTC (rev 204498)
+++ trunk/Source/WebCore/dom/EventListenerMap.cpp 2016-08-16 06:48:34 UTC (rev 204499)
@@ -89,7 +89,7 @@
{
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;
}
return notFound;
@@ -154,7 +154,7 @@
static void removeFirstListenerCreatedFromMarkup(EventListenerVector& listenerVector)
{
bool foundListener = listenerVector.removeFirstMatching([] (const auto& registeredListener) {
- if (registeredListener->listener().wasCreatedFromMarkup()) {
+ if (registeredListener->callback().wasCreatedFromMarkup()) {
registeredListener->markAsRemoved();
return true;
}
@@ -181,9 +181,9 @@
{
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());
}
}
@@ -226,7 +226,7 @@
for (; m_entryIndex < m_map->m_entries.size(); ++m_entryIndex) {
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;
}
Modified: trunk/Source/WebCore/dom/EventTarget.cpp (204498 => 204499)
--- trunk/Source/WebCore/dom/EventTarget.cpp 2016-08-16 06:41:33 UTC (rev 204498)
+++ trunk/Source/WebCore/dom/EventTarget.cpp 2016-08-16 06:48:34 UTC (rev 204499)
@@ -116,8 +116,8 @@
EventListener* EventTarget::getAttributeEventListener(const AtomicString& eventType)
{
for (auto& eventListener : getEventListeners(eventType)) {
- if (eventListener->listener().isAttribute())
- return &eventListener->listener();
+ if (eventListener->callback().isAttribute())
+ return &eventListener->callback();
}
return nullptr;
}
@@ -241,7 +241,7 @@
// 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())
event.setInPassiveListener(true);
@@ -249,7 +249,7 @@
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willHandleEvent(context, event);
// 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);
if (registeredListener->isPassive())
Modified: trunk/Source/WebCore/dom/RegisteredEventListener.h (204498 => 204499)
--- trunk/Source/WebCore/dom/RegisteredEventListener.h 2016-08-16 06:41:33 UTC (rev 204498)
+++ trunk/Source/WebCore/dom/RegisteredEventListener.h 2016-08-16 06:48:34 UTC (rev 204499)
@@ -49,7 +49,7 @@
return adoptRef(*new RegisteredEventListener(WTFMove(listener), options));
}
- 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; }
bool isOnce() const { return m_isOnce; }
@@ -59,7 +59,7 @@
private:
RegisteredEventListener(Ref<EventListener>&& listener, const Options& options)
- : m_listener(WTFMove(listener))
+ : m_callback(WTFMove(listener))
, m_useCapture(options.capture)
, m_isPassive(options.passive)
, m_isOnce(options.once)
@@ -66,7 +66,7 @@
{
}
- Ref<EventListener> m_listener;
+ Ref<EventListener> m_callback;
bool m_useCapture { false };
bool m_isPassive { false };
bool m_isOnce { false };
Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (204498 => 204499)
--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-08-16 06:41:33 UTC (rev 204498)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-08-16 06:48:34 UTC (rev 204499)
@@ -860,7 +860,7 @@
EventListenerVector filteredListeners;
filteredListeners.reserveInitialCapacity(listeners.size());
for (auto& listener : listeners) {
- if (listener->listener().type() == EventListener::JSEventListenerType)
+ if (listener->callback().type() == EventListener::JSEventListenerType)
filteredListeners.uncheckedAppend(listener);
}
if (!filteredListeners.isEmpty())
@@ -1477,7 +1477,7 @@
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;
JSC::JSObject* handler = nullptr;
