Changeset 170664 in webkit

Timestamp:

Jul 1, 2014, 2:07:40 PM (12 years ago)

Author:

andersca@apple.com

Message:

Add a function for restoring page state given a SessionState object
​https://bugs.webkit.org/show_bug.cgi?id=134509

Reviewed by Tim Horton.

• Shared/WebBackForwardListItem.h:

(WebKit::WebBackForwardListItem::itemState):

• UIProcess/WebBackForwardList.cpp:

(WebKit::WebBackForwardList::saveState):

• UIProcess/WebBackForwardList.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::saveState):

• UIProcess/WebPageProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebBackForwardListItem.h (modified) (1 diff)
• UIProcess/WebBackForwardList.cpp (modified) (1 diff)
• UIProcess/WebBackForwardList.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.cpp.rej (added)
• UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-01  Anders Carlsson  <andersca@apple.com>
+
+        Add a function for restoring page state given a SessionState object
+        https://bugs.webkit.org/show_bug.cgi?id=134509
+
+        Reviewed by Tim Horton.
+
+        * Shared/WebBackForwardListItem.h:
+        (WebKit::WebBackForwardListItem::itemState):
+        * UIProcess/WebBackForwardList.cpp:
+        (WebKit::WebBackForwardList::saveState):
+        * UIProcess/WebBackForwardList.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::saveState):
+        * UIProcess/WebPageProxy.h:
+
 2014-07-01  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Shared/WebBackForwardListItem.h

@@ -55 +55 @@
 
     uint64_t itemID() const { return m_itemID; }
+    const BackForwardListItemState& itemState() { return m_itemState; }
 
     void setPageState(PageState pageState) { m_itemState.pageState = std::move(pageState); }

trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp

@@ -381 +381 @@
 }
 
+BackForwardListState WebBackForwardList::backForwardListState(const std::function<bool (WebBackForwardListItem&)>& filter) const
+{
+    ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
+
+    BackForwardListState backForwardListState;
+    if (m_hasCurrentIndex)
+        backForwardListState.currentIndex = m_currentIndex;
+
+    for (size_t i = 0; i < m_entries.size(); ++i) {
+        auto& entry = *m_entries[i];
+
+        if (filter && !filter(entry)) {
+            if (backForwardListState.currentIndex && i <= backForwardListState.currentIndex.value())
+                --backForwardListState.currentIndex.value();
+
+            continue;
+        }
+
+        backForwardListState.items.append(entry.itemState());
+    }
+
+    return backForwardListState;
+}
+
 void WebBackForwardList::restoreFromState(BackForwardListState backForwardListState)
 {

trunk/Source/WebKit2/UIProcess/WebBackForwardList.h

@@ -80 +80 @@
 #endif
 
+    BackForwardListState backForwardListState(const std::function<bool (WebBackForwardListItem&)>&) const;
     void restoreFromState(BackForwardListState);
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1848 +1848 @@
 #endif
 
+SessionState WebPageProxy::sessionState(const std::function<bool (WebBackForwardListItem&)>& filter) const
+{
+    SessionState sessionState;
+
+    sessionState.backForwardListState = m_backForwardList->backForwardListState(filter);
+
+    String provisionalURLString = m_pageLoadState.pendingAPIRequestURL();
+    if (provisionalURLString.isEmpty())
+        provisionalURLString = m_pageLoadState.provisionalURL();
+
+    if (!provisionalURLString.isEmpty())
+        sessionState.provisionalURL = URL(URL(), provisionalURLString);
+
+    return sessionState;
+}
+
 uint64_t WebPageProxy::restoreFromState(SessionState sessionState)
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -551 +551 @@
     void terminateProcess();
 
+    SessionState sessionState(const std::function<bool (WebBackForwardListItem&)>&) const;
     PassRefPtr<API::Data> sessionStateData(std::function<bool (WebBackForwardListItem&)>) const;
     uint64_t restoreFromSessionStateData(API::Data*);