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

Unified Diff: third_party/WebKit/Source/core/input/TouchEventManager.h

Issue 2860663006: Remove WebTouchEvent from TouchEventManager APIs (Closed)
Patch Set: Created 3 years, 7 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/input/TouchEventManager.h
diff --git a/third_party/WebKit/Source/core/input/TouchEventManager.h b/third_party/WebKit/Source/core/input/TouchEventManager.h
index d791b497b80851c9f7df3395518bcfab2718f435..79371c7581bf42eb0c0119165654311ad5a6c8d4 100644
--- a/third_party/WebKit/Source/core/input/TouchEventManager.h
+++ b/third_party/WebKit/Source/core/input/TouchEventManager.h
@@ -7,16 +7,17 @@
#include "core/CoreExport.h"
#include "core/events/PointerEventFactory.h"
+#include "core/input/EventHandlingUtil.h"
#include "platform/wtf/Allocator.h"
#include "platform/wtf/HashMap.h"
#include "public/platform/WebInputEventResult.h"
+#include "public/platform/WebPointerEvent.h"
#include "public/platform/WebTouchPoint.h"
namespace blink {
class LocalFrame;
class Document;
-class WebTouchEvent;
// This class takes care of dispatching all touch events and
// maintaining related states.
@@ -46,16 +47,10 @@ class CORE_EXPORT TouchEventManager
explicit TouchEventManager(LocalFrame&);
DECLARE_TRACE();
- // Does the hit-testing again if the original hit test result was not inside
- // capturing frame for touch events. Returns true if touch events could be
- // dispatched and otherwise returns false.
- bool ReHitTestTouchPointsIfNeeded(const WebTouchEvent&,
- HeapVector<TouchInfo>&);
-
// The TouchInfo array is reference just to prevent the copy. However, it
// cannot be const as this function might change some of the properties in
// TouchInfo objects.
- WebInputEventResult HandleTouchEvent(const WebTouchEvent&,
+ WebInputEventResult HandleTouchEvent(const Vector<WebCoalescedPointerEvent>&,
HeapVector<TouchInfo>&);
// Resets the internal state of this object.
@@ -68,9 +63,16 @@ class CORE_EXPORT TouchEventManager
void UpdateTargetAndRegionMapsForTouchStarts(HeapVector<TouchInfo>&);
void SetAllPropertiesOfTouchInfos(HeapVector<TouchInfo>&);
- WebInputEventResult DispatchTouchEvents(const WebTouchEvent&,
- const HeapVector<TouchInfo>&,
- bool all_touches_released);
+ WebInputEventResult DispatchTouchEvents(
+ const Vector<WebCoalescedPointerEvent>&,
+ const HeapVector<TouchInfo>&,
+ bool all_touches_released);
+
+ // Does the hit-testing again if the original hit test result was not inside
+ // capturing frame for touch events. Returns true if touch events could be
+ // dispatched and otherwise returns false.
+ bool ReHitTestTouchPointsIfNeeded(const Vector<WebCoalescedPointerEvent>&,
+ HeapVector<TouchInfo>&);
// NOTE: If adding a new field to this class please ensure that it is
// cleared in |TouchEventManager::clear()|.

Powered by Google App Engine
This is Rietveld 408576698