Report accurate Overscroll on handleWheel.

Source/platform/scroll/ScrollAnimator.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 76 matching lines @@
     ScrollResult result;
 
 #if !OS(MACOSX)
     ScrollGranularity granularity = e.hasPreciseScrollingDeltas() ? ScrollByPrecisePixel : ScrollByPixel;
 #else
     ScrollGranularity granularity = ScrollByPixel;
 #endif
 
     IntSize maxForwardScrollDelta = m_scrollableArea->maximumScrollPosition() - m_scrollableArea->scrollPosition();
     IntSize maxBackwardScrollDelta = m_scrollableArea->scrollPosition() - m_scrollableArea->minimumScrollPosition();
-    if ((deltaX < 0 && maxForwardScrollDelta.width() > 0)
-        || (deltaX > 0 && maxBackwardScrollDelta.width() > 0))
-        result.didScrollX = true;
-    if ((deltaY < 0 && maxForwardScrollDelta.height() > 0)
-        || (deltaY > 0 && maxBackwardScrollDelta.height() > 0))
-        result.didScrollY = true;
-    if (result.didScroll()) {
-        if (deltaY) {
-            if (e.granularity() == ScrollByPageWheelEvent) {
-                bool negative = deltaY < 0;
-                deltaY = m_scrollableArea->pageStep(VerticalScrollbar);
-                if (negative)
-                    deltaY = -deltaY;
-            }
+    result.didScrollX = (deltaX < 0 && maxForwardScrollDelta.width() > 0) || (deltaX > 0 && maxBackwardScrollDelta.width() > 0);
+    result.didScrollY = (deltaY < 0 && maxForwardScrollDelta.height() > 0) || (deltaY > 0 && maxBackwardScrollDelta.height() > 0);

[bokan, 2015/06/23 16:20:45]

Since we're going to try to scroll now anyways, it'd be more clear to save the
scrollableArea scrollPosition here and set didScrollX/Y below based on whether
the scrollPosition changed.

[MuVen, 2015/06/25 12:55:51]

Done.

 
-            ScrollResultOneDimensional resultY = userScroll(
-                VerticalScrollbar, granularity, m_scrollableArea->pixelStep(VerticalScrollbar), -deltaY);
-
-            if (e.granularity() != ScrollByPageWheelEvent) {
-                if (resultY.didScroll)
-                    result.unusedScrollDeltaY = -resultY.unusedScrollDelta;
-                else
-                    result.unusedScrollDeltaY = deltaY;
-            }
+    if (deltaY) {
+        if (e.granularity() == ScrollByPageWheelEvent) {
+            bool negative = deltaY < 0;
+            deltaY = m_scrollableArea->pageStep(VerticalScrollbar);
+            if (negative)
+                deltaY = -deltaY;
         }
 
-        if (deltaX) {
-            if (e.granularity() == ScrollByPageWheelEvent) {
-                bool negative = deltaX < 0;
-                deltaX = m_scrollableArea->pageStep(HorizontalScrollbar);
-                if (negative)
-                    deltaX = -deltaX;
-            }
+        ScrollResultOneDimensional resultY = userScroll(
+            VerticalScrollbar, granularity, m_scrollableArea->pixelStep(VerticalScrollbar), -deltaY);
 
-            ScrollResultOneDimensional resultX = userScroll(
-                HorizontalScrollbar, granularity, m_scrollableArea->pixelStep(HorizontalScrollbar), -deltaX);
-
-            if (e.granularity() != ScrollByPageWheelEvent) {
-                if (resultX.didScroll)
-                    result.unusedScrollDeltaX = -resultX.unusedScrollDelta;
-                else
-                    result.unusedScrollDeltaX = deltaX;
-            }
+        if (e.granularity() != ScrollByPageWheelEvent) {
+            if (resultY.didScroll)
+                result.unusedScrollDeltaY = -resultY.unusedScrollDelta;
+            else
+                result.unusedScrollDeltaY = deltaY;
         }
     }
 
+    if (deltaX) {
+        if (e.granularity() == ScrollByPageWheelEvent) {
+            bool negative = deltaX < 0;
+            deltaX = m_scrollableArea->pageStep(HorizontalScrollbar);
+            if (negative)
+                deltaX = -deltaX;
+        }
+
+        ScrollResultOneDimensional resultX = userScroll(
+            HorizontalScrollbar, granularity, m_scrollableArea->pixelStep(HorizontalScrollbar), -deltaX);
+
+        if (e.granularity() != ScrollByPageWheelEvent) {
+            if (resultX.didScroll)
+                result.unusedScrollDeltaX = -resultX.unusedScrollDelta;
+            else
+                result.unusedScrollDeltaX = deltaX;
+        }
+    }
+
     return result;
 }
 
 void ScrollAnimator::setCurrentPosition(const FloatPoint& position)
 {
     m_currentPosX = position.x();
     m_currentPosY = position.y();
 }
 
 FloatPoint ScrollAnimator::currentPosition() const
 {
     return FloatPoint(m_currentPosX, m_currentPosY);
 }
 
 void ScrollAnimator::notifyPositionChanged()
 {
     m_scrollableArea->scrollPositionChanged(DoublePoint(m_currentPosX, m_currentPosY), UserScroll);
 }
 
 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, float pos)
 {
     float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation);
     float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation);
     return std::max(std::min(pos, maxScrollPos), minScrollPos);
 }
 
 } // namespace blink