commit 5750bb7d8f59c0f8e18baaa60bcb492c867db590
author Derek Sollenberger <djsollen@google.com> Fri Mar 18 10:57:46 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 18 10:57:46 2011 -0700
tree debda6f12998d0e52e90c3fb2daffdabdc19e3e4
parent 0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776
parent a249a93e8d7166e503992d32eaf44f9e53c16753

Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 72052a6..f2a1ec3 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -504,7 +504,7 @@
     }
 
     public boolean isFixedLengthAnimationInProgress() {
-        return mZoomScale != 0;
+        return mZoomScale != 0 || mInHWAcceleratedZoom;
     }
 
     public void refreshZoomScale(boolean reflowText) {