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 9634047c3793db0ae1eaf08d4e9ed131e1e0a5b6..06ca34d1ac8d93c998c86d920138f680b7270818 100644 |
--- a/third_party/WebKit/Source/core/input/EventHandler.h |
+++ b/third_party/WebKit/Source/core/input/EventHandler.h |
@@ -64,6 +64,7 @@ template <typename EventType> |
class EventWithHitTestResults; |
class FloatPoint; |
class FloatQuad; |
+class FrameHost; |
class HTMLFrameSetElement; |
class HitTestRequest; |
class HitTestResult; |
@@ -240,9 +241,6 @@ public: |
String region; |
}; |
- // TODO(bokan): This seems like it no longer belongs here. |
- void handleOverscroll(const ScrollResult&, const FloatPoint& positionInRootFrame = FloatPoint(), const FloatSize& velocity = FloatSize()); |
- |
private: |
static DragState& dragState(); |
@@ -318,8 +316,6 @@ private: |
// If not, use the current focus or last clicked node. |
bool logicalScroll(ScrollDirection, ScrollGranularity, Node* startNode = nullptr); |
- void resetOverscroll(bool didScrollX, bool didScrollY); |
- |
ScrollResult scrollBox( |
LayoutBox*, |
ScrollGranularity, |
@@ -402,6 +398,8 @@ private: |
WebInputEventResult dispatchTouchEvents(const PlatformTouchEvent&, HeapVector<TouchInfo>&, bool); |
+ FrameHost* frameHost(); |
+ |
// NOTE: If adding a new field to this class please ensure that it is |
// cleared in |EventHandler::clear()|. |
@@ -452,8 +450,6 @@ private: |
LayoutSize m_offsetFromResizeCorner; // In the coords of m_resizeScrollableArea. |
- FloatSize m_accumulatedRootOverscroll; |
- |
bool m_mousePositionIsUnknown; |
// The last mouse movement position this frame has seen in root frame coordinates. |
IntPoint m_lastKnownMousePosition; |