commit 645511b68dd274967dd34261d80e828b5c8871c8
author Shimeng (Simon) Wang <swang@google.com> Mon Jul 11 14:40:04 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 11 14:40:04 2011 -0700
tree 97c3644c5c4bd5bd46b720f8e7da2f01d58fe959
parent 5623b074977d55a61f29099f44670916c6282e51
parent 07ac175452a4ba984a478a29416b8c4da2fce28f

Merge "Set mActualScale when initialScale is set."

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