Merge "Update viewport asap." (ab5a5e67) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebViewCore.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -2235,14 +2235,9 @@ public final class WebViewCore {

		// called by JNI
		private void updateViewport() {
		// if updateViewport is called before first layout, wait until first
		// layout to update the viewport. In the rare case, this is called after
		// first layout, force an update as we have just parsed the viewport
		// meta tag.
		if (mBrowserFrame.firstLayoutDone()) {
		// Update viewport asap to make sure we get correct one.
		setupViewport(true);
		}
		}

		private void setupViewport(boolean updateViewState) {
		// set the viewport settings from WebKit
		@@ -2375,8 +2370,12 @@ public final class WebViewCore {
		(float) webViewWidth / mViewportWidth;
		} else {
		mInitialViewState.mTextWrapScale = adjust;
		if (mSettings.getUseWideViewPort()) {
		// 0 will trigger WebView to turn on zoom overview mode
		mInitialViewState.mViewScale = 0;
		} else {
		mInitialViewState.mViewScale = adjust;
		}
		}
		}

		@@ -2407,7 +2406,7 @@ public final class WebViewCore {
		mEventHub.removeMessages(EventHub.VIEW_SIZE_CHANGED);
		mEventHub.sendMessageAtFrontOfQueue(Message.obtain(null,
		EventHub.VIEW_SIZE_CHANGED, data));
		} else if (mSettings.getUseWideViewPort()) {
		} else {
		if (viewportWidth == 0) {
		// Trick to ensure VIEW_SIZE_CHANGED will be sent from WebView
		// to WebViewCore