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

Unified Diff: Source/core/page/EventHandler.h

Issue 1144313003: Added PointerEvent firing on touch events. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed primary pointer id on reuse, for each type of Pointers. 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
Index: Source/core/page/EventHandler.h
diff --git a/Source/core/page/EventHandler.h b/Source/core/page/EventHandler.h
index a2314445140e2e5224e4b092500258fd976636db..5411a587c95e637974124b80134ba956c157b52c 100644
--- a/Source/core/page/EventHandler.h
+++ b/Source/core/page/EventHandler.h
@@ -28,6 +28,7 @@
#include "core/CoreExport.h"
#include "core/editing/TextGranularity.h"
+#include "core/events/PointerEventUtils.h"
#include "core/events/TextEventInputType.h"
#include "core/layout/HitTestRequest.h"
#include "core/style/ComputedStyleConstants.h"
@@ -35,6 +36,7 @@
#include "core/page/EventWithHitTestResults.h"
#include "platform/Cursor.h"
#include "platform/PlatformMouseEvent.h"
+#include "platform/PlatformTouchPoint.h"
#include "platform/Timer.h"
#include "platform/UserGestureIndicator.h"
#include "platform/geometry/LayoutPoint.h"
@@ -65,6 +67,7 @@ class HTMLFrameSetElement;
class HitTestRequest;
class HitTestResult;
class KeyboardEvent;
+class LayoutObject;
class LocalFrame;
class Node;
class OptionalCursor;
@@ -72,7 +75,6 @@ class PlatformGestureEvent;
class PlatformKeyboardEvent;
class PlatformTouchEvent;
class PlatformWheelEvent;
-class LayoutObject;
class ScrollableArea;
class Scrollbar;
class ScrollState;
@@ -329,6 +331,17 @@ private:
// element. Returns true if the resulting focus is different from the given element.
bool slideFocusOnShadowHostIfNecessary(const Element&);
+ using TouchInfo = struct {
+ EventTarget* touchTarget;
+ LocalFrame* targetFrame;
+ FloatPoint adjustedPagePoint;
+ FloatSize adjustedRadius;
+ bool knownTarget;
+ bool consumed;
+ };
+
+ void handlePointerEventsFromTouchEvent(const PlatformTouchEvent&, const Vector<PlatformTouchPoint>&, Vector<TouchInfo>&);
+
// NOTE: If adding a new field to this class please ensure that it is
// cleared in |EventHandler::clear()|.
@@ -402,6 +415,8 @@ private:
bool m_touchPressed;
+ PointerIdManager m_pointerIdManager;
+
RefPtrWillBeMember<Node> m_scrollGestureHandlingNode;
bool m_lastGestureScrollOverWidget;
// The most recent element to scroll natively during this scroll

Powered by Google App Engine
This is Rietveld 408576698