Merge "finalise scrolling before checking scroll position"

Author: Victoria Lease

core/java/android/webkit/WebViewClassic.java

@@ -3896,6 +3896,7 @@ private boolean pinScrollBy(int dx, int dy, boolean animate, int animationDurati
     // helper to pin the scrollTo parameters (already in view coordinates)
     // returns true if the scroll was changed
     private boolean pinScrollTo(int x, int y, boolean animate, int animationDuration) {
+        abortAnimation();
         x = pinLocX(x);
         y = pinLocY(y);
         int dx = x - getScrollX();
@@ -3904,7 +3905,6 @@ private boolean pinScrollTo(int x, int y, boolean animate, int animationDuration
         if ((dx | dy) == 0) {
             return false;
         }
-        abortAnimation();
         if (animate) {
             //        Log.d(LOGTAG, "startScroll: " + dx + " " + dy);
             mScroller.startScroll(getScrollX(), getScrollY(), dx, dy,