Merge "Clamp initial scale between minimum and maximum values." into ics-mr1

Author: mghiware

core/java/android/webkit/WebViewCore.java

@@ -2290,6 +2290,18 @@ private void setupViewport(boolean updateViewState) {
         // set the viewport settings from WebKit
         setViewportSettingsFromNative();
 
+        // clamp initial scale
+        if (mViewportInitialScale > 0) {
+            if (mViewportMinimumScale > 0) {
+                mViewportInitialScale = Math.max(mViewportInitialScale,
+                        mViewportMinimumScale);
+            }
+            if (mViewportMaximumScale > 0) {
+                mViewportInitialScale = Math.min(mViewportInitialScale,
+                        mViewportMaximumScale);
+            }
+        }
+
         if (mSettings.forceUserScalable()) {
             mViewportUserScalable = true;
             if (mViewportInitialScale > 0) {