Merge "Use website specified viewport." (71579f97) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebViewCore.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -1705,7 +1705,12 @@ final class WebViewCore {
		nativeGetContentMinPrefWidth())));
		}
		} else if (mViewportWidth > 0) {
		if (mSettings.getUseFixedViewport()) {
		// Use website specified viewport width.
		width = mViewportWidth;
		} else {
		width = Math.max(w, mViewportWidth);
		}
		} else {
		width = textwrapWidth;
		}
		@@ -1780,6 +1785,7 @@ final class WebViewCore {
		int mScrollX;
		int mScrollY;
		boolean mMobileSite;
		int mViewportWidth;
		}

		static class DrawData {
		@@ -2154,6 +2160,7 @@ final class WebViewCore {
		mInitialViewState.mScrollX = mRestoredX;
		mInitialViewState.mScrollY = mRestoredY;
		mInitialViewState.mMobileSite = (0 == mViewportWidth);
		mInitialViewState.mViewportWidth = mViewportWidth;
		if (mRestoredScale > 0) {
		mInitialViewState.mViewScale = mRestoredScale / 100.0f;
		if (mRestoredTextWrapScale > 0) {

+7 −1

Original line number	Diff line number	Diff line
		@@ -770,6 +770,12 @@ class ZoomManager {
		} else {
		mMaxZoomScale = viewState.mMaxScale;
		}
		if (viewState.mViewportWidth > 0 &&
		mWebView.getSettings().getUseFixedViewport() &&
		mWebView.getSettings().getUseWideViewPort()) {
		// Use website specified viewport width.
		setZoomOverviewWidth(viewState.mViewportWidth);
		}
		}

		/**
		@@ -835,7 +841,7 @@ class ZoomManager {
		if (settings.getUseWideViewPort()
		&& (settings.getLoadWithOverviewMode() \|\| settings.getUseFixedViewport())) {
		mInitialZoomOverview = true;
		scale = (float) mWebView.getViewWidth() / WebView.DEFAULT_VIEWPORT_WIDTH;
		scale = (float) mWebView.getViewWidth() / mZoomOverviewWidth;
		} else {
		scale = viewState.mTextWrapScale;
		}