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

Commit 763e62a8 authored by Grace Kloba's avatar Grace Kloba
Browse files

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

We skipped a call to WebKit at the end of the zoom
animation in the last CL.

Fix http://b/issue?id=2578820
parent 842d983c

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

            }

        }