Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4af0ed6 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android Git Automerger
Browse files

am 0c8e22b1: am 25dad8ed: am 5750bb7d: Merge "Prevent intermediate scale... 

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

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

core/java/android/webkit/ZoomManager.java

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ class ZoomManager { 
    }



    public boolean isFixedLengthAnimationInProgress() {

        return mZoomScale != 0;

        return mZoomScale != 0 || mInHWAcceleratedZoom;

    }



    public void refreshZoomScale(boolean reflowText) {