Merge "Squashed commit of the following:" (065efeb6) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+28 −25

Original line number	Diff line number	Diff line
		@@ -5927,9 +5927,11 @@ public class WebView extends AbsoluteLayout
		WebViewCore.RestoreState restoreState = draw.mRestoreState;
		boolean hasRestoreState = restoreState != null;
		if (hasRestoreState) {
		mInZoomOverview = false;
		updateZoomRange(restoreState, viewSize.x,
		draw.mMinPrefWidth, true);
		if (!mDrawHistory) {
		mInZoomOverview = false;

		if (mInitialScaleInPercent > 0) {
		setNewZoomScale(mInitialScaleInPercent / 100.0f,
		mInitialScaleInPercent != mTextWrapScale * 100,
		@@ -5963,6 +5965,7 @@ public class WebView extends AbsoluteLayout
		updateZoomButtonsEnabled();
		}
		}
		}
		// We update the layout (i.e. request a layout from the
		// view system) if the last view size that we sent to
		// WebCore matches the view size of the picture we just