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 51fbc7b855cec6e37b0f8ad1bf310870fcea2955..e75cacd6e36e04e34425b79d7123231a1a87609f 100644 |
--- a/third_party/WebKit/Source/core/input/ScrollManager.h |
+++ b/third_party/WebKit/Source/core/input/ScrollManager.h |
@@ -95,8 +95,8 @@ class CORE_EXPORT ScrollManager |
WebInputEventResult handleGestureScrollUpdate(const WebGestureEvent&); |
WebInputEventResult handleGestureScrollBegin(const WebGestureEvent&); |
- WebInputEventResult passScrollGestureEventToWidget(const WebGestureEvent&, |
- LayoutObject*); |
+ WebInputEventResult passScrollGestureEvent(const WebGestureEvent&, |
+ LayoutObject*); |
void clearGestureScrollState(); |
@@ -121,7 +121,7 @@ class CORE_EXPORT ScrollManager |
Member<Node> m_scrollGestureHandlingNode; |
- bool m_lastGestureScrollOverWidget; |
+ bool m_lastGestureScrollOverFrameViewBase; |
// The most recent element to scroll natively during this scroll |
// sequence. Null if no native element has scrolled this scroll |