| Index: third_party/WebKit/Source/core/input/ScrollManager.h
|
| diff --git a/third_party/WebKit/Source/core/input/ScrollManager.h b/third_party/WebKit/Source/core/input/ScrollManager.h
|
| index 9b506a00b5c7c969e6bf9dc890e5cb76cd7b542e..5bb958996e081bff0856860160021de8428e1dfb 100644
|
| --- a/third_party/WebKit/Source/core/input/ScrollManager.h
|
| +++ b/third_party/WebKit/Source/core/input/ScrollManager.h
|
| @@ -25,7 +25,6 @@ class LayoutObject;
|
| class LocalFrame;
|
| class PaintLayer;
|
| class PaintLayerScrollableArea;
|
| -class PlatformGestureEvent;
|
| class Scrollbar;
|
| class ScrollState;
|
|
|
| @@ -75,9 +74,9 @@ class CORE_EXPORT ScrollManager
|
|
|
| // Handle the provided scroll gesture event, propagating down to child frames
|
| // as necessary.
|
| - WebInputEventResult handleGestureScrollEvent(const PlatformGestureEvent&);
|
| + WebInputEventResult handleGestureScrollEvent(const WebGestureEvent&);
|
|
|
| - WebInputEventResult handleGestureScrollEnd(const PlatformGestureEvent&);
|
| + WebInputEventResult handleGestureScrollEnd(const WebGestureEvent&);
|
|
|
| bool isScrollbarHandlingGestures() const;
|
|
|
| @@ -93,12 +92,11 @@ class CORE_EXPORT ScrollManager
|
| void setResizeScrollableArea(PaintLayer*, IntPoint);
|
|
|
| private:
|
| - WebInputEventResult handleGestureScrollUpdate(const PlatformGestureEvent&);
|
| - WebInputEventResult handleGestureScrollBegin(const PlatformGestureEvent&);
|
| + WebInputEventResult handleGestureScrollUpdate(const WebGestureEvent&);
|
| + WebInputEventResult handleGestureScrollBegin(const WebGestureEvent&);
|
|
|
| - WebInputEventResult passScrollGestureEventToWidget(
|
| - const PlatformGestureEvent&,
|
| - LayoutObject*);
|
| + WebInputEventResult passScrollGestureEventToWidget(const WebGestureEvent&,
|
| + LayoutObject*);
|
|
|
| void clearGestureScrollState();
|
|
|
| @@ -108,7 +106,7 @@ class CORE_EXPORT ScrollManager
|
|
|
| bool isEffectiveRootScroller(const Node&) const;
|
|
|
| - bool handleScrollGestureOnResizer(Node*, const PlatformGestureEvent&);
|
| + bool handleScrollGestureOnResizer(Node*, const WebGestureEvent&);
|
|
|
| void recomputeScrollChain(const Node& startNode,
|
| std::deque<int>& scrollChain);
|
|
|