summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shimeng (Simon) Wang <swang@google.com> 2011-06-09 16:41:18 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-06-09 16:41:18 -0700
commit52a31da29f4534715679ee040c7530d2721e5dbc (patch)
tree9679f5d31d41343fa0ea6a0e9d5d04c8b7b6b3b9
parent92a1af549899d249c86adf601da8ead3997e0d10 (diff)
parent82a077043fe8ea8b7bc3575afc3f0f68b7fc193b (diff)
Merge "Consider default zoom scale for mobile viewport."
-rw-r--r--core/java/android/webkit/WebViewCore.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 309e6ff04d5a..06a61bdceb21 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -1900,7 +1900,7 @@ public final class WebViewCore {
width = mViewportWidth;
} else {
// For mobile web site.
- width = mWebView.getViewWidth();
+ width = Math.round(mWebView.getViewWidth() / mWebView.getDefaultZoomScale());
}
}
return width;