drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Grace Kloba
2010-04-13 16:05:34 -07:00
committed by Android Git Automerger
parent ecf917b68d 346c97c477
commit 105c58de02
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/webkit/WebView.java
View File

@ -2150,11 +2150,15 @@ public class WebView extends AbsoluteLayout
mScrollX = pinLocX(Math.round(sx)); mScrollX = pinLocX(Math.round(sx));
mScrollY = pinLocY(Math.round(sy)); mScrollY = pinLocY(Math.round(sy));
// update webkit
if (oldX != mScrollX || oldY != mScrollY) { if (oldX != mScrollX || oldY != mScrollY) {
onScrollChanged(mScrollX, mScrollY, oldX, oldY); 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(); sendViewSizeZoom();
} }
} }