Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2492)

Unified Diff: third_party/WebKit/Source/core/events/EventTarget.cpp

Issue 1479923002: Enumerate the return value of dispatchEvent so it is clear. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_passive_uma_add
Patch Set: Add back the EventDispatchResult enum Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/events/EventTarget.cpp
diff --git a/third_party/WebKit/Source/core/events/EventTarget.cpp b/third_party/WebKit/Source/core/events/EventTarget.cpp
index 15bd846035344ffc91e74802d52da4c5e6adea18..66247a23306b61a684d7b70589c3c4d0b3caed22 100644
--- a/third_party/WebKit/Source/core/events/EventTarget.cpp
+++ b/third_party/WebKit/Source/core/events/EventTarget.cpp
@@ -249,8 +249,13 @@ bool EventTarget::clearAttributeEventListener(const AtomicString& eventType)
return removeEventListener(eventType, listener, false);
}
-bool EventTarget::dispatchEventForBindings(PassRefPtrWillBeRawPtr<Event> event, ExceptionState& exceptionState)
+bool EventTarget::dispatchEventForBindings(PassRefPtrWillBeRawPtr<Event> dispatchEvent, ExceptionState& exceptionState)
{
+ RefPtrWillBeRawPtr<Event> event = dispatchEvent;
+ if (!event) {
tkent 2016/02/22 01:40:22 This check is unnecessary. It's done in binding l
dtapuska 2016/02/23 19:14:40 Done.
+ exceptionState.throwDOMException(InvalidStateError, "The event provided is null.");
+ return false;
+ }
if (event->type().isEmpty()) {
exceptionState.throwDOMException(InvalidStateError, "The event provided is uninitialized.");
return false;
@@ -264,23 +269,28 @@ bool EventTarget::dispatchEventForBindings(PassRefPtrWillBeRawPtr<Event> event,
return false;
event->setTrusted(false);
- return dispatchEventInternal(event);
+
+ // Return whether the event was cancelled or not to JS not that it
+ // might have actually been handled; so throw away the result of
+ // dispatchEventInternal.
+ dispatchEventInternal(event);
+ return !event->defaultPrevented();
}
-bool EventTarget::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
+EventTarget::DispatchEventResult EventTarget::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
{
event->setTrusted(true);
return dispatchEventInternal(event);
}
-bool EventTarget::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)
+EventTarget::DispatchEventResult EventTarget::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)
{
event->setTarget(this);
event->setCurrentTarget(this);
event->setEventPhase(Event::AT_TARGET);
- bool defaultWasNotPrevented = fireEventListeners(event.get());
+ EventTarget::DispatchEventResult result = fireEventListeners(event.get());
event->setEventPhase(0);
- return defaultWasNotPrevented;
+ return result;
}
void EventTarget::uncaughtExceptionInEventHandler()
@@ -348,14 +358,14 @@ void EventTarget::countLegacyEvents(const AtomicString& legacyTypeName, EventLis
}
}
-bool EventTarget::fireEventListeners(Event* event)
+EventTarget::DispatchEventResult EventTarget::fireEventListeners(Event* event)
{
ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
ASSERT(event && !event->type().isEmpty());
EventTargetData* d = eventTargetData();
if (!d)
- return true;
+ return EventTarget::DispatchEventResult::NotHandled;
EventListenerVector* legacyListenersVector = nullptr;
AtomicString legacyTypeName = legacyType(event);
@@ -375,7 +385,7 @@ bool EventTarget::fireEventListeners(Event* event)
Editor::countEvent(executionContext(), event);
countLegacyEvents(legacyTypeName, listenersVector, legacyListenersVector);
- return !event->defaultPrevented();
+ return event->eventResult();
}
void EventTarget::fireEventListeners(Event* event, EventTargetData* d, EventListenerVector& entry)

Powered by Google App Engine
This is Rietveld 408576698