commit 9c64bae134f1fa497bbeef2f263df4d8d21c415e
author Shimeng (Simon) Wang <swang@google.com> Fri Oct 22 10:52:57 2010 -0700
committer Shimeng (Simon) Wang <swang@google.com> Fri Oct 22 10:57:44 2010 -0700
tree 77dca484ff79724fbf2bb71311f16a7f8f02eb70
parent 5c1cf3593db18784f36349d9fd9c25b8e623d354

Ignore viewport viewScale in fixed viewport mode.

This is to solve macworld.com, which has 900 as viewport but actual
content width is more 1000.

issue: 3003933
Change-Id: I2db3f66828fd00c8be62131599395eb82752b4a2

core/java/android/webkit/WebViewCore.java

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 71da36d..1c8e2cd 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -2203,7 +2203,8 @@
             if (mViewportInitialScale > 0) {
                 mInitialViewState.mViewScale = mInitialViewState.mTextWrapScale =
                         mViewportInitialScale / 100.0f;
-            } else if (mViewportWidth > 0 && mViewportWidth < webViewWidth) {
+            } else if (mViewportWidth > 0 && mViewportWidth < webViewWidth &&
+                !mWebView.getSettings().getUseFixedViewport()) {
                 mInitialViewState.mViewScale = mInitialViewState.mTextWrapScale =
                         (float) webViewWidth / mViewportWidth;
             } else {