Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed viewport enhancement for site with viewport tag."

Browse Source
This commit is contained in:
Shimeng (Simon) Wang
2010-10-14 14:30:17 -07:00
committed by Android (Google) Code Review
parent fec30790e8 afc1c25177
commit 7ffe05227e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/webkit/ZoomManager.java
View File

@@ -830,20 +830,26 @@ class ZoomManager {
WebViewCore.ViewState viewState = drawData.mViewState;
final Point viewSize = drawData.mViewPoint;
updateZoomRange(viewState, viewSize.x, drawData.mMinPrefWidth);
if (mWebView.getSettings().getUseWideViewPort() &&
mWebView.getSettings().getUseFixedViewport()) {
final int contentWidth = drawData.mWidthHeight.x;
setZoomOverviewWidth(Math.min(WebView.sMaxViewportWidth, contentWidth));
}
if (!mWebView.drawHistory()) {
final float scale;
final boolean reflowText;
WebSettings settings = mWebView.getSettings();
if (mInitialScale > 0) {
scale = mInitialScale;
reflowText = exceedsMinScaleIncrement(mTextWrapScale, scale);
} else if (viewState.mViewScale > 0) {
} else if (viewState.mViewScale > 0 &&
(viewState.mMobileSite || !settings.getUseFixedViewport())) {
mTextWrapScale = viewState.mTextWrapScale;
scale = viewState.mViewScale;
reflowText = false;
} else {
WebSettings settings = mWebView.getSettings();
if (settings.getUseWideViewPort()
&& (settings.getLoadWithOverviewMode() || settings.getUseFixedViewport())) {
mInitialZoomOverview = true;