From a249a93e8d7166e503992d32eaf44f9e53c16753 Mon Sep 17 00:00:00 2001
From: Derek Sollenberger <djsollen@google.com>
Date: Fri, 18 Mar 2011 11:28:54 -0400
Subject: [PATCH] Prevent intermediate scale updates from being sent to WebKit
 while zooming.

The addition of the HW accelerated logic causes us to manipulate the
zoom scale factor in the zoom manager two additional times. These
manipulations occur after the mZoomScale has been set to zero is how we
previously tested to see if a fixed length animation was occuring.

bug: 3451126
Change-Id: If2992adbe36fa471bb1bb5013495e1adc74b5fab
---
 core/java/android/webkit/ZoomManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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