From 763e62a831f6cf4e113bff868dab4d48560a3693 Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Tue, 13 Apr 2010 11:31:15 -0700 Subject: [PATCH] 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 --- core/java/android/webkit/WebView.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 4f2a67bfb1538..06a7a6f4c127c 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -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(); } }