diff options
| author | 2011-07-11 14:40:04 -0700 | |
|---|---|---|
| committer | 2011-07-11 14:40:04 -0700 | |
| commit | 645511b68dd274967dd34261d80e828b5c8871c8 (patch) | |
| tree | 97c3644c5c4bd5bd46b720f8e7da2f01d58fe959 | |
| parent | 5623b074977d55a61f29099f44670916c6282e51 (diff) | |
| parent | 07ac175452a4ba984a478a29416b8c4da2fce28f (diff) | |
Merge "Set mActualScale when initialScale is set."
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index 7d3f3138c469..49ea9445e46f 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -344,6 +344,8 @@ class ZoomManager { public final void setInitialScaleInPercent(int scaleInPercent) { mInitialScale = scaleInPercent * 0.01f; + mActualScale = mInitialScale > 0 ? mInitialScale : mDefaultScale; + mInvActualScale = 1 / mActualScale; } public final float computeScaleWithLimits(float scale) { |