Layout before creating the base layer.

WebKit asserts during draw that the frame does not need a layout.  Do the layout
to also get the most updated data.

Move the bridge assert after the parent check as some frames are never attached
and no history item is created.

Change-Id: If646d6ed2b409a3078d2f7a6793b7aed94ffecaf

1 files changed, 4 insertions, 4 deletions

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index d165afa..52fa4ee 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -807,12 +807,12 @@ void FrameLoaderClientAndroid::frameLoadCompleted() {
 void FrameLoaderClientAndroid::saveViewStateToItem(HistoryItem* item) {
     ASSERT(m_frame);
     ASSERT(item);
-    // We should have added a bridge when the child item was added to its
-    // parent.
-    AndroidWebHistoryBridge* bridge = item->bridge();
-    ASSERT(bridge);
     // store the current scale (only) for the top frame
     if (!m_frame->tree()->parent()) {
+        // We should have added a bridge when the child item was added to its
+        // parent.
+        AndroidWebHistoryBridge* bridge = item->bridge();
+        ASSERT(bridge);
         WebViewCore* webViewCore = WebViewCore::getWebViewCore(m_frame->view());
         bridge->setScale(webViewCore->scale());
         bridge->setTextWrapScale(webViewCore->textWrapScale());