Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1

Browse Source
This commit is contained in:
Derek Sollenberger
2011-11-28 10:34:04 -08:00
committed by Android (Google) Code Review
parent 2ffc9ec3d6 8fae09d575
commit 425c595acb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webkit/ZoomManager.java
View File

@@ -498,6 +498,11 @@ class ZoomManager {
if (mZoomScale == 0) { if (mZoomScale == 0) {
// We've reached the end of the zoom animation. // We've reached the end of the zoom animation.
mInHWAcceleratedZoom = false; mInHWAcceleratedZoom = false;
// Ensure that the zoom level is pushed to WebCore. This has not
// yet occurred because we prevent it from happening while
// mInHWAcceleratedZoom is true.
mWebView.sendViewSizeZoom(false);
} }
} else { } else {
canvas.translate(tx, ty); canvas.translate(tx, ty);