Chromium Code Reviews| 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 c2ee3de569be2a48872ee2ed5495b9995606ecab..8f749daa3fbbf12854db5ff29eb54e05ea6497f1 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" |
|
majidvp
2016/12/15 17:40:45
nit: why not forward declare?
dtapuska
2016/12/15 21:29:38
Done.
|
| #include "public/platform/WebInputEvent.h" |
| #include "public/platform/WebInputEventResult.h" |
| #include "wtf/Forward.h" |
| @@ -69,7 +70,6 @@ class LayoutObject; |
| class LocalFrame; |
| class Node; |
| class OptionalCursor; |
| -class PlatformGestureEvent; |
| class PlatformTouchEvent; |
| class PlatformWheelEvent; |
| class ScrollableArea; |
| @@ -149,7 +149,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 |
| @@ -162,10 +162,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. |
| @@ -174,8 +174,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&, |
| @@ -266,7 +266,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&); |
| @@ -278,7 +278,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&, |