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 b7c6182a783e877555928968994193ce1d2a7fec..a5f69d79d4ac6d3fead93c92fbdd4ef8849a5cc7 100644 |
--- a/third_party/WebKit/Source/core/input/ScrollManager.h |
+++ b/third_party/WebKit/Source/core/input/ScrollManager.h |
@@ -25,9 +25,9 @@ class LayoutObject; |
class LocalFrame; |
class PaintLayer; |
class PaintLayerScrollableArea; |
-class PlatformGestureEvent; |
class Scrollbar; |
class ScrollState; |
+class WebGestureEvent; |
// This class takes care of scrolling and resizing and the related states. The |
// user action that causes scrolling or resizing is determined in other *Manager |
@@ -75,9 +75,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; |
@@ -86,19 +86,18 @@ class CORE_EXPORT ScrollManager |
// These functions are related to |m_resizeScrollableArea|. |
bool inResizeMode() const; |
- void resize(const PlatformEvent&); |
+ void resize(const PlatformMouseEvent&); |
// Clears |m_resizeScrollableArea|. if |shouldNotBeNull| is true this |
// function DCHECKs to make sure that variable is indeed not null. |
void clearResizeScrollableArea(bool shouldNotBeNull); |
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 +107,7 @@ class CORE_EXPORT ScrollManager |
bool isViewportScrollingElement(const Element&) const; |
- bool handleScrollGestureOnResizer(Node*, const PlatformGestureEvent&); |
+ bool handleScrollGestureOnResizer(Node*, const WebGestureEvent&); |
void recomputeScrollChain(const Node& startNode, |
std::deque<int>& scrollChain); |