From f53c1865248dd2b38f8c24a0419d550330619b19 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Mon, 21 Sep 2009 16:26:11 -0700
Subject: [PATCH] Don't snap the initialScale to min or max if it is not
 defined.

Fix http://b/issue?id=2133821
---
 core/java/android/webkit/WebViewCore.java | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index d4142bb9c078e..da0dfa7a12f79 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -1867,19 +1867,13 @@ final class WebViewCore {
             mViewportMinimumScale = WebView.DEFAULT_SCALE_PERCENT;
             mViewportMaximumScale = WebView.DEFAULT_SCALE_PERCENT;
         }
-        if (mViewportMinimumScale > mViewportInitialScale) {
-            if (mViewportInitialScale == 0) {
-                mViewportInitialScale = mViewportMinimumScale;
-            } else {
-                mViewportMinimumScale = mViewportInitialScale;
-            }
+        if (mViewportMinimumScale > mViewportInitialScale
+                && mViewportInitialScale != 0) {
+            mViewportMinimumScale = mViewportInitialScale;
         }
-        if (mViewportMaximumScale > 0) {
-            if (mViewportMaximumScale < mViewportInitialScale) {
-                mViewportMaximumScale = mViewportInitialScale;
-            } else if (mViewportInitialScale == 0) {
-                mViewportInitialScale = mViewportMaximumScale;
-            }
+        if (mViewportMaximumScale > 0
+                && mViewportMaximumScale < mViewportInitialScale) {
+            mViewportMaximumScale = mViewportInitialScale;
         }
         if (mViewportWidth < 0
                 && mViewportInitialScale == WebView.DEFAULT_SCALE_PERCENT) {