<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170664] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170664">170664</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-01 14:07:40 -0700 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBackForwardListItemh">trunk/Source/WebKit2/Shared/WebBackForwardListItem.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListcpp">trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListh">trunk/Source/WebKit2/UIProcess/WebBackForwardList.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpprej">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170663 => 170664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/ChangeLog        2014-07-01 21:07:40 UTC (rev 170664)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-07-01 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Navigation parameter in navigation delegate messages is nil for navigations started by the Web Content process
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (170663 => 170664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h        2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h        2014-07-01 21:07:40 UTC (rev 170664)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> virtual ~WebBackForwardListItem();
</span><span class="cx">
</span><span class="cx"> uint64_t itemID() const { return m_itemID; }
</span><ins>+ const BackForwardListItemState& itemState() { return m_itemState; }
</ins><span class="cx">
</span><span class="cx"> void setPageState(PageState pageState) { m_itemState.pageState = std::move(pageState); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (170663 => 170664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp        2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp        2014-07-01 21:07:40 UTC (rev 170664)
</span><span class="lines">@@ -380,6 +380,30 @@
</span><span class="cx"> m_page->didChangeBackForwardList(nullptr, std::move(removedItems));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> void WebBackForwardList::restoreFromState(BackForwardListState backForwardListState)
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebBackForwardListItem>> items;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (170663 => 170664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h        2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h        2014-07-01 21:07:40 UTC (rev 170664)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> bool restoreFromV1CFDictionaryRepresentation(CFDictionaryRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ BackForwardListState backForwardListState(const std::function<bool (WebBackForwardListItem&)>&) const;
</ins><span class="cx"> void restoreFromState(BackForwardListState);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170663 => 170664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-07-01 21:07:40 UTC (rev 170664)
</span><span class="lines">@@ -1847,6 +1847,22 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> uint64_t WebPageProxy::restoreFromState(SessionState sessionState)
</span><span class="cx"> {
</span><span class="cx"> m_backForwardList->restoreFromState(std::move(sessionState.backForwardListState));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpprej"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej (0 => 170664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej         (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej        2014-07-01 21:07:40 UTC (rev 170664)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+***************
+*** 515,536 ****
+
+ #if ENABLE(INSPECTOR_SERVER)
+- if (pageGroup().preferences()->developerExtrasEnabled())
+ inspector()->enableRemoteInspection();
+ #endif
+
+- if (pageGroup().addProcess(process()))
+- process().addWebPageGroup(pageGroup());
+-
+ initializeCreationParameters();
+- process().send(Messages::WebProcess::CreateWebPage(m_pageID, m_creationParameters), 0);
+
+ #if ENABLE(PAGE_VISIBILITY_API)
+- process().send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true), m_pageID);
+ #elif ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
+- process().send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true), m_pageID);
+ #endif
+
+ #if PLATFORM(MAC)
+- process().send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled), m_pageID);
+ #endif
+ }
+--- 515,533 ----
+
+ #if ENABLE(INSPECTOR_SERVER)
++ if (m_pageGroup->preferences()->developerExtrasEnabled())
+ inspector()->enableRemoteInspection();
+ #endif
+
+ initializeCreationParameters();
++ m_process->send(Messages::WebProcess::CreateWebPage(m_pageID, m_creationParameters), 0);
+
+ #if ENABLE(PAGE_VISIBILITY_API)
++ m_process->send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true), m_pageID);
+ #elif ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
++ m_process->send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true), m_pageID);
+ #endif
+
+ #if PLATFORM(MAC)
++ m_process->send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled), m_pageID);
+ #endif
+ }
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (170663 => 170664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2014-07-01 21:07:40 UTC (rev 170664)
</span><span class="lines">@@ -550,6 +550,7 @@
</span><span class="cx">
</span><span class="cx"> void terminateProcess();
</span><span class="cx">
</span><ins>+ SessionState sessionState(const std::function<bool (WebBackForwardListItem&)>&) const;
</ins><span class="cx"> PassRefPtr<API::Data> sessionStateData(std::function<bool (WebBackForwardListItem&)>) const;
</span><span class="cx"> uint64_t restoreFromSessionStateData(API::Data*);
</span><span class="cx"> uint64_t restoreFromState(SessionState);
</span></span></pre>
</div>
</div>
</body>
</html>