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

Unified Diff: Source/core/frame/EventHandlerRegistry.cpp

Issue 1144313003: Added PointerEvent firing on touch events. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. TODO fixes. Created 5 years, 6 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
« no previous file with comments | « Source/core/events/ThreadLocalEventNames.h ('k') | Source/core/input/EventHandler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/EventHandlerRegistry.cpp
diff --git a/Source/core/frame/EventHandlerRegistry.cpp b/Source/core/frame/EventHandlerRegistry.cpp
index c66d92fc74574694aa45fadfdb438b9fa88eff9c..45f5d67e4de779623b8a5503290287c62802d144 100644
--- a/Source/core/frame/EventHandlerRegistry.cpp
+++ b/Source/core/frame/EventHandlerRegistry.cpp
@@ -5,7 +5,6 @@
#include "config.h"
#include "core/frame/EventHandlerRegistry.h"
-#include "core/events/ThreadLocalEventNames.h"
#include "core/frame/LocalDOMWindow.h"
#include "core/frame/LocalFrame.h"
#include "core/html/HTMLFrameOwnerElement.h"
@@ -15,6 +14,32 @@
namespace blink {
+namespace {
+
+inline bool isTouchEventType(const AtomicString& eventType)
+{
+ return eventType == EventTypeNames::touchstart
+ || eventType == EventTypeNames::touchmove
+ || eventType == EventTypeNames::touchend
+ || eventType == EventTypeNames::touchcancel;
+}
+
+inline bool isPointerEventType(const AtomicString& eventType)
+{
+ return eventType == EventTypeNames::gotpointercapture
+ || eventType == EventTypeNames::lostpointercapture
+ || eventType == EventTypeNames::pointercancel
+ || eventType == EventTypeNames::pointerdown
+ || eventType == EventTypeNames::pointerenter
+ || eventType == EventTypeNames::pointerleave
+ || eventType == EventTypeNames::pointermove
+ || eventType == EventTypeNames::pointerout
+ || eventType == EventTypeNames::pointerover
+ || eventType == EventTypeNames::pointerup;
+}
+
+} // namespace
+
EventHandlerRegistry::EventHandlerRegistry(FrameHost& frameHost)
: m_frameHost(frameHost)
{
@@ -33,6 +58,10 @@ bool EventHandlerRegistry::eventTypeToClass(const AtomicString& eventType, Event
*result = WheelEvent;
} else if (isTouchEventType(eventType)) {
*result = TouchEvent;
+ } else if (isPointerEventType(eventType)) {
+ // The EventHandlerClass is still TouchEvent below since we are firing PointerEvents only from
+ // EventHandler::handleTouchEvent for now. See crbug.com/476565.
+ *result = TouchEvent;
#if ENABLE(ASSERT)
} else if (eventType == EventTypeNames::load || eventType == EventTypeNames::mousemove || eventType == EventTypeNames::touchstart) {
*result = EventsForTesting;
« no previous file with comments | « Source/core/events/ThreadLocalEventNames.h ('k') | Source/core/input/EventHandler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698