Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58af51a1 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files
Merge commit '763e62a8' into froyo-plus-aosp

* commit '763e62a8':
  Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
parents feb976e6 763e62a8
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -2150,11 +2150,15 @@ public class WebView extends AbsoluteLayout
                mScrollX = pinLocX(Math.round(sx));
                mScrollY = pinLocY(Math.round(sy));

                // update webkit
                if (oldX != mScrollX || oldY != mScrollY) {
                    onScrollChanged(mScrollX, mScrollY, oldX, oldY);
                } else {
                    // the scroll position is adjusted at the beginning of the
                    // zoom animation. But we want to update the WebKit at the
                    // end of the zoom animation. See comments in onScaleEnd().
                    sendOurVisibleRect();
                }

                // update webkit
                sendViewSizeZoom();
            }
        }