diff options
Diffstat (limited to 'core/java/android/webkit/WebViewCore.java')
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index e46d731c7d46..6aae794bf13b 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -1931,7 +1931,19 @@ final class WebViewCore { } // if mViewportWidth is 0, it means device-width, always update. - if (mViewportWidth != 0 && !updateRestoreState) return; + if (mViewportWidth != 0 && !updateRestoreState) { + RestoreState restoreState = new RestoreState(); + restoreState.mMinScale = mViewportMinimumScale / 100.0f; + restoreState.mMaxScale = mViewportMaximumScale / 100.0f; + restoreState.mDefaultScale = adjust; + // as mViewportWidth is not 0, it is not mobile site. + restoreState.mMobileSite = false; + // for non-mobile site, we don't need minPrefWidth, set it as 0 + restoreState.mScrollX = 0; + Message.obtain(mWebView.mPrivateHandler, + WebView.UPDATE_ZOOM_RANGE, restoreState).sendToTarget(); + return; + } // now notify webview // webViewWidth refers to the width in the view system |