Changeset 170679 in webkit

Timestamp:

Jul 1, 2014, 5:08:13 PM (12 years ago)

Author:

andersca@apple.com

Message:

WKPageRestoreFromSessionState should use the new session state restore code path
​https://bugs.webkit.org/show_bug.cgi?id=134526

Reviewed by Tim Horton.

• UIProcess/API/C/WKPage.cpp:

(WKPageRestoreFromSessionState):
Use the new code path.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::restoreFromState):
Only restore the back-forward state if we have a back-forward list.

• UIProcess/mac/LegacySessionStateCoding.cpp:

(WebKit::encodeSessionHistory):
Save the original URL string as well.

(WebKit::decodeV1SessionHistory):
If we don't have a current index, set it to Nullopt instead of 0.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• UIProcess/mac/LegacySessionStateCoding.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-01  Anders Carlsson  <andersca@apple.com>
+
+        WKPageRestoreFromSessionState should use the new session state restore code path
+        https://bugs.webkit.org/show_bug.cgi?id=134526
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageRestoreFromSessionState):
+        Use the new code path.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::restoreFromState):
+        Only restore the back-forward state if we have a back-forward list.
+
+        * UIProcess/mac/LegacySessionStateCoding.cpp:
+        (WebKit::encodeSessionHistory):
+        Save the original URL string as well.
+
+        (WebKit::decodeV1SessionHistory):
+        If we don't have a current index, set it to Nullopt instead of 0.
+
 2014-07-01  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -370 +370 @@
 void WKPageRestoreFromSessionState(WKPageRef pageRef, WKDataRef sessionStateData)
 {
-    toImpl(pageRef)->restoreFromSessionStateData(toImpl(sessionStateData));
+    SessionState sessionState;
+    if (!decodeLegacySessionState(*toImpl(sessionStateData), sessionState))
+        return;
+
+    toImpl(pageRef)->restoreFromState(std::move(sessionState));
 }
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1866 +1866 @@
 uint64_t WebPageProxy::restoreFromState(SessionState sessionState)
 {
-    m_backForwardList->restoreFromState(std::move(sessionState.backForwardListState));
-
-    LegacySessionState state(m_backForwardList->entries(), m_backForwardList->currentIndex());
-    process().send(Messages::WebPage::RestoreSession(state), m_pageID);
+    bool hasBackForwardList = !!sessionState.backForwardListState.currentIndex;
+
+    if (hasBackForwardList) {
+        m_backForwardList->restoreFromState(std::move(sessionState.backForwardListState));
+        for (const auto& entry : m_backForwardList->entries())
+            process().registerNewWebBackForwardListItem(entry.get());
+
+        LegacySessionState state(m_backForwardList->entries(), m_backForwardList->currentIndex());
+        process().send(Messages::WebPage::RestoreSession(state), m_pageID);
+    }
 
     // FIXME: Navigating should be separate from state restoration.
@@ -1876 +1882 @@
         return loadRequest(sessionState.provisionalURL);
 
-    if (WebBackForwardListItem* item = m_backForwardList->currentItem())
-        return goToBackForwardItem(item);
+    if (hasBackForwardList) {
+        // FIXME: Do we have to null check the back forward list item here?
+        if (WebBackForwardListItem* item = m_backForwardList->currentItem())
+            return goToBackForwardItem(item);
+    }
 
     return 0;

trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp

@@ -438 +438 @@
         auto data = encodeSessionHistoryEntryData(item.pageState.mainFrameState);
 
-        auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleKey, title.get() }, { sessionHistoryEntryDataKey, data.get() }, { sessionHistoryEntrySnapshotUUIDKey, item.snapshotUUID.createCFString().get() }});
+        auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleKey, title.get() }, { sessionHistoryEntryOriginalURLKey, originalURL.get() }, { sessionHistoryEntryDataKey, data.get() }, { sessionHistoryEntrySnapshotUUIDKey, item.snapshotUUID.createCFString().get() }});
 
         CFArrayAppendValue(entries.get(), entryDictionary.get());
@@ -1023 +1023 @@
     if (!currentIndexNumber) {
         // No current index means the dictionary represents an empty session.
-        backForwardListState.currentIndex = 0;
+        backForwardListState.currentIndex = Nullopt;
         backForwardListState.items = { };
         return true;