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

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: Rebase Created 5 years 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 5526aa5b7c33d68b1fbfbc7c2a215db053ee570a..017671464a2c75fb85a96f288d9adaa46f6d674c 100644
--- a/third_party/WebKit/Source/core/events/EventTarget.cpp
+++ b/third_party/WebKit/Source/core/events/EventTarget.cpp
@@ -247,8 +247,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) {
+ exceptionState.throwDOMException(InvalidStateError, "The event provided is null.");
philipj_slow 2015/12/04 22:38:51 Why did you add back the null check? If it was whi
dtapuska 2015/12/07 14:25:30 Ah yes resolve issue because I needed to hold onto
+ return false;
+ }
if (event->type().isEmpty()) {
exceptionState.throwDOMException(InvalidStateError, "The event provided is uninitialized.");
return false;
@@ -262,23 +267,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
philipj_slow 2015/12/04 22:38:51 Does this change observable behavior? I can't unde
dtapuska 2015/12/07 14:25:30 Well it may in some cases; Touch and Mouse event l
philipj_slow 2015/12/07 15:03:56 It would be good if any observable changes are don
+ // might have actually been handled; so throw away the result of
+ // dispatchEventInternal.
+ dispatchEventInternal(event);
+ return !event->defaultPrevented();
}
-bool EventTarget::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
+WebInputEventResult EventTarget::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
{
event->setTrusted(true);
return dispatchEventInternal(event);
}
-bool EventTarget::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)
+WebInputEventResult EventTarget::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)
{
event->setTarget(this);
event->setCurrentTarget(this);
event->setEventPhase(Event::AT_TARGET);
- bool defaultWasNotPrevented = fireEventListeners(event.get());
+ WebInputEventResult result = fireEventListeners(event.get());
event->setEventPhase(0);
- return defaultWasNotPrevented;
+ return result;
}
void EventTarget::uncaughtExceptionInEventHandler()
@@ -342,14 +352,14 @@ void EventTarget::countLegacyEvents(const AtomicString& legacyTypeName, EventLis
}
}
-bool EventTarget::fireEventListeners(Event* event)
+WebInputEventResult EventTarget::fireEventListeners(Event* event)
{
ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
ASSERT(event && !event->type().isEmpty());
EventTargetData* d = eventTargetData();
if (!d)
- return true;
+ return WebInputEventResult::NotHandled;
EventListenerVector* legacyListenersVector = nullptr;
AtomicString legacyTypeName = legacyType(event);
@@ -369,7 +379,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)
« no previous file with comments | « third_party/WebKit/Source/core/events/EventTarget.h ('k') | third_party/WebKit/Source/core/events/FocusEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698