Index: third_party/WebKit/Source/core/input/EventHandler.h |
diff --git a/third_party/WebKit/Source/core/input/EventHandler.h b/third_party/WebKit/Source/core/input/EventHandler.h |
index 983b92df000d798d470314099e95d53d680101cb..c1a02e224585af8b87bca2cfbab83f2670ed24c3 100644 |
--- a/third_party/WebKit/Source/core/input/EventHandler.h |
+++ b/third_party/WebKit/Source/core/input/EventHandler.h |
@@ -44,6 +44,7 @@ |
#include "platform/geometry/LayoutPoint.h" |
#include "platform/heap/Handle.h" |
#include "platform/scroll/ScrollTypes.h" |
+#include "public/platform/WebGestureEvent.h" |
#include "public/platform/WebInputEvent.h" |
#include "public/platform/WebInputEventResult.h" |
#include "wtf/Forward.h" |
@@ -70,7 +71,6 @@ class LayoutObject; |
class LocalFrame; |
class Node; |
class OptionalCursor; |
-class PlatformGestureEvent; |
class PlatformTouchEvent; |
class PlatformWheelEvent; |
class ScrollableArea; |
@@ -151,7 +151,7 @@ class CORE_EXPORT EventHandler final |
WebInputEventResult handleWheelEvent(const PlatformWheelEvent&); |
// Called on the local root frame exactly once per gesture event. |
- WebInputEventResult handleGestureEvent(const PlatformGestureEvent&); |
+ WebInputEventResult handleGestureEvent(const WebGestureEvent&); |
WebInputEventResult handleGestureEvent(const GestureEventWithHitTestResults&); |
// Clear the old hover/active state within frames before moving the hover |
@@ -164,10 +164,10 @@ class CORE_EXPORT EventHandler final |
// frame. |
// Note: This is similar to (the less clearly named) prepareMouseEvent. |
// FIXME: Remove readOnly param when there is only ever a single call to this. |
- GestureEventWithHitTestResults targetGestureEvent(const PlatformGestureEvent&, |
+ GestureEventWithHitTestResults targetGestureEvent(const WebGestureEvent&, |
bool readOnly = false); |
GestureEventWithHitTestResults hitTestResultForGestureEvent( |
- const PlatformGestureEvent&, |
+ const WebGestureEvent&, |
HitTestRequest::HitTestRequestType); |
// Handle the provided non-scroll gesture event. Should be called only on the |
// inner frame. |
@@ -176,8 +176,8 @@ class CORE_EXPORT EventHandler final |
// Handle the provided scroll gesture event, propagating down to child frames |
// as necessary. |
- WebInputEventResult handleGestureScrollEvent(const PlatformGestureEvent&); |
- WebInputEventResult handleGestureScrollEnd(const PlatformGestureEvent&); |
+ WebInputEventResult handleGestureScrollEvent(const WebGestureEvent&); |
+ WebInputEventResult handleGestureScrollEnd(const WebGestureEvent&); |
bool isScrollbarHandlingGestures() const; |
bool bestClickableNodeForHitTestResult(const HitTestResult&, |
@@ -268,7 +268,7 @@ class CORE_EXPORT EventHandler final |
HitTestRequest::HitTestRequestType getHitTypeForGestureType( |
PlatformEvent::EventType); |
- void applyTouchAdjustment(PlatformGestureEvent*, HitTestResult*); |
+ void applyTouchAdjustment(WebGestureEvent*, HitTestResult*); |
WebInputEventResult handleGestureTapDown( |
const GestureEventWithHitTestResults&); |
WebInputEventResult handleGestureTap(const GestureEventWithHitTestResults&); |
@@ -280,7 +280,7 @@ class CORE_EXPORT EventHandler final |
void updateGestureTargetNodeForMouseEvent( |
const GestureEventWithHitTestResults&); |
- bool shouldApplyTouchAdjustment(const PlatformGestureEvent&) const; |
+ bool shouldApplyTouchAdjustment(const WebGestureEvent&) const; |
OptionalCursor selectCursor(const HitTestResult&); |
OptionalCursor selectAutoCursor(const HitTestResult&, |