commit 07ac175452a4ba984a478a29416b8c4da2fce28f
author Shimeng (Simon) Wang <swang@google.com> Mon Jul 11 14:13:17 2011 -0700
committer Shimeng (Simon) Wang <swang@google.com> Mon Jul 11 14:13:17 2011 -0700
tree 6a0136d7ce52cae0c9408a7795a7768dba31ca5c
parent bc2861fdbbd94548513246f74f994cfc99f95004

Set mActualScale when initialScale is set.

This sets mActualScale to be correct value if initialScale is set.

issue: 4982074
Change-Id: I69d12d185710e89fc91a3a6bdf566c7092f059b7

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 7d3f313..49ea944 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -344,6 +344,8 @@
 
     public final void setInitialScaleInPercent(int scaleInPercent) {
         mInitialScale = scaleInPercent * 0.01f;
+        mActualScale = mInitialScale > 0 ? mInitialScale : mDefaultScale;
+        mInvActualScale = 1 / mActualScale;
     }
 
     public final float computeScaleWithLimits(float scale) {