commit e4af0ed6b3853ee1bca3b52899c99ee3f933b9ec
author Derek Sollenberger <djsollen@google.com> Fri Mar 18 11:27:12 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 18 11:27:12 2011 -0700
tree 3461060a1b209f7acf7168067dead661ce96b267
parent 0e898b59d8bcd7cf75ffb9cac1b83f00d2754ee4
parent 0c8e22b1d3dbcd4580db2a288af65fcca10cde1b

am 0c8e22b1: am 25dad8ed: am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1

* commit '0c8e22b1d3dbcd4580db2a288af65fcca10cde1b':
  Prevent intermediate scale updates from being sent to WebKit while zooming.

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) {