diff options
| author | 2011-10-17 17:50:39 -0700 | |
|---|---|---|
| committer | 2011-10-17 17:50:39 -0700 | |
| commit | 08eaa9de7637a634f65d943582583699855ef20c (patch) | |
| tree | fa1c27b51e4d5b43db9194892cd4f20399bd98e5 | |
| parent | e119e1d6a4606ea6c1c0c7b530184dea34621f69 (diff) | |
| parent | 7788c51d82963a8645655675c675424db694ad85 (diff) | |
am 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0
* commit '7788c51d82963a8645655675c675424db694ad85':
Fix onFirstLayout path for saved pages
| -rw-r--r-- | core/java/android/webkit/WebView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index cf6e187ffb74..71ba7ebfb9a5 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1917,6 +1917,7 @@ public class WebView extends AbsoluteLayout mLoadedPicture = ViewStateSerializer.deserializeViewState(stream, this); mBlockWebkitViewMessages = true; setNewPicture(mLoadedPicture, true); + mLoadedPicture.mViewState = null; return true; } catch (IOException e) { Log.w(LOGTAG, "Failed to loadViewState", e); @@ -4358,7 +4359,9 @@ public class WebView extends AbsoluteLayout selectionDone(); } mOrientation = newConfig.orientation; - mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT); + if (mWebViewCore != null && !mBlockWebkitViewMessages) { + mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT); + } } /** |