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

* commit '5750bb7d8f59c0f8e18baaa60bcb492c867db590':
  Prevent intermediate scale updates from being sent to WebKit while zooming.
This commit is contained in:
Derek Sollenberger
2011-03-18 11:02:45 -07:00
committed by Android Git Automerger

View File

@@ -504,7 +504,7 @@ class ZoomManager {
}
public boolean isFixedLengthAnimationInProgress() {
return mZoomScale != 0;
return mZoomScale != 0 || mInHWAcceleratedZoom;
}
public void refreshZoomScale(boolean reflowText) {