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

Unified Diff: third_party/WebKit/Source/core/events/EventDispatcher.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/EventDispatcher.cpp
diff --git a/third_party/WebKit/Source/core/events/EventDispatcher.cpp b/third_party/WebKit/Source/core/events/EventDispatcher.cpp
index d069a1c9915fdbd64d5f4580fc562e9c1d86c480..09670070961b70af82fd9ab1f1511a864c1660fa 100644
--- a/third_party/WebKit/Source/core/events/EventDispatcher.cpp
+++ b/third_party/WebKit/Source/core/events/EventDispatcher.cpp
@@ -42,7 +42,7 @@
namespace blink {
-bool EventDispatcher::dispatchEvent(Node& node, PassRefPtrWillBeRawPtr<EventDispatchMediator> mediator)
+WebInputEventResult EventDispatcher::dispatchEvent(Node& node, PassRefPtrWillBeRawPtr<EventDispatchMediator> mediator)
{
TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("blink.debug"), "EventDispatcher::dispatchEvent");
ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
@@ -102,7 +102,7 @@ void EventDispatcher::dispatchSimulatedClick(Node& node, Event* underlyingEvent,
nodesDispatchingSimulatedClicks->remove(&node);
}
-bool EventDispatcher::dispatch()
+WebInputEventResult EventDispatcher::dispatch()
{
TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("blink.debug"), "EventDispatcher::dispatch");
@@ -112,7 +112,7 @@ bool EventDispatcher::dispatch()
#endif
if (event().eventPath().isEmpty()) {
// eventPath() can be empty if event path is shrinked by relataedTarget retargeting.
- return true;
+ return WebInputEventResult::NotHandled;
}
m_event->eventPath().ensureWindowEventContext();
@@ -135,7 +135,7 @@ bool EventDispatcher::dispatch()
m_event->setCurrentTarget(nullptr);
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data());
- return !m_event->defaultPrevented();
+ return m_event->eventResult();
}
inline EventDispatchContinuation EventDispatcher::dispatchEventPreProcess(void*& preDispatchEventHandlerResult)

Powered by Google App Engine
This is Rietveld 408576698