diff options
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index 230cc51438a8..c55d180a86af 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -673,10 +673,9 @@ class ZoomManager { public boolean onScale(ScaleGestureDetector detector) { // Prevent scaling beyond overview scale. - float scale = Math.max( - Math.round(detector.getScaleFactor() * mActualScale * 100) * 0.01f, - getZoomOverviewScale()); - if (willScaleTriggerZoom(scale)) { + float scale = Math.max(detector.getScaleFactor() * mActualScale, + getZoomOverviewScale()); + if (mPinchToZoomAnimating || willScaleTriggerZoom(scale)) { mPinchToZoomAnimating = true; // limit the scale change per step if (scale > mActualScale) { |