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

Commit 346c97c4 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am 58af51a1: am 763e62a8: Fix a case introduced by... 

am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640

Merge commit '58af51a1' into kraken

* commit '58af51a1':
  Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
parents 61f280d5 58af51a1

core/java/android/webkit/WebView.java

+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();

            }

        }