Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix onFirstLayout path for saved pages" into ics-mr0

Browse Source
This commit is contained in:
John Reck
2011-10-17 17:48:58 -07:00
committed by Android (Google) Code Review
parent f129988a1a 23a446cf27
commit 7788c51d82
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webkit/WebView.java
View File

@@ -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);
@@ -4355,7 +4356,9 @@ public class WebView extends AbsoluteLayout
selectionDone();
}
mOrientation = newConfig.orientation;
mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT);
if (mWebViewCore != null && !mBlockWebkitViewMessages) {
mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT);
}
}
/**