Index: Source/core/page/EventHandler.h |
diff --git a/Source/core/page/EventHandler.h b/Source/core/page/EventHandler.h |
index a2314445140e2e5224e4b092500258fd976636db..84c4dc4d09ac51dd1eaddcf1515c333b0a6579d6 100644 |
--- a/Source/core/page/EventHandler.h |
+++ b/Source/core/page/EventHandler.h |
@@ -128,6 +128,9 @@ public: |
void resizeScrollableAreaDestroyed(); |
+ FloatSize unusedDeltaForTesting() const { return m_unusedDelta; } |
+ FloatSize accumulatedRootOverscrollForTesting() const { return m_accumulatedRootOverscroll; } |
+ |
IntPoint lastKnownMousePosition() const; |
// Attempts to scroll the DOM tree. If that fails, scrolls the view. |
@@ -261,7 +264,9 @@ private: |
// On output, if provided and a node was scrolled stopNode will point to that node. |
// delta - The delta to scroll by, in the units of the granularity parameter. (e.g. pixels, lines, pages, etc.) |
// absolutePoint - For wheel scrolls - the location, in absolute coordinates, where the event occured. |
- bool scroll(ScrollDirection, ScrollGranularity, Node* startNode = nullptr, Node** stopNode = nullptr, float delta = 1.0f, IntPoint absolutePoint = IntPoint()); |
+ ScrollResultOneDimensional scroll(ScrollDirection, ScrollGranularity, Node* startNode = nullptr, Node** stopNode = nullptr, float delta = 1.0f, IntPoint absolutePoint = IntPoint()); |
+ |
+ void resetOverscroll(bool didScrollX, bool didScrollY); |
void customizedScroll(const Node& startNode, ScrollState&); |
@@ -378,6 +383,9 @@ private: |
LayoutSize m_offsetFromResizeCorner; // In the coords of m_resizeScrollableArea. |
+ FloatSize m_unusedDelta; |
+ FloatSize m_accumulatedRootOverscroll; |
+ |
bool m_mousePositionIsUnknown; |
// The last mouse movement position this frame has seen in root frame coordinates. |
IntPoint m_lastKnownMousePosition; |