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

am 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0

Browse Source 
* commit '7788c51d82963a8645655675c675424db694ad85':
  Fix onFirstLayout path for saved pages
This commit is contained in:
John Reck
2011-10-17 17:50:39 -07:00
committed by Android Git Automerger
parent e119e1d6a4 7788c51d82
commit 08eaa9de76
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); mLoadedPicture = ViewStateSerializer.deserializeViewState(stream, this);
mBlockWebkitViewMessages = true; mBlockWebkitViewMessages = true;
setNewPicture(mLoadedPicture, true); setNewPicture(mLoadedPicture, true);
mLoadedPicture.mViewState = null;
return true; return true;
} catch (IOException e) { } catch (IOException e) {
Log.w(LOGTAG, "Failed to loadViewState", e); Log.w(LOGTAG, "Failed to loadViewState", e);
@@ -4358,7 +4359,9 @@ public class WebView extends AbsoluteLayout
selectionDone(); selectionDone();
} }
mOrientation = newConfig.orientation; mOrientation = newConfig.orientation;
mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT); if (mWebViewCore != null && !mBlockWebkitViewMessages) {
mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT);
}
} }
/** /**