<!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>[170626] 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/170626">170626</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-30 18:29:38 -0700 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a function to restore a WebBackForwardList object from a BackForwardListState object
https://bugs.webkit.org/show_bug.cgi?id=134478
Reviewed by Tim Horton.
* UIProcess/WebBackForwardList.cpp:
(WebKit::generateWebBackForwardItemID):
(WebKit::WebBackForwardList::restoreFromState):
* UIProcess/WebBackForwardList.h:
* UIProcess/cf/WebBackForwardListCF.cpp:
(WebKit::generateWebBackForwardItemID): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2UIProcesscfWebBackForwardListCFcpp">trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170625 => 170626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-01 01:06:35 UTC (rev 170625)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 01:29:38 UTC (rev 170626)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-06-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add a function to restore a WebBackForwardList object from a BackForwardListState object
+ https://bugs.webkit.org/show_bug.cgi?id=134478
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::generateWebBackForwardItemID):
+ (WebKit::WebBackForwardList::restoreFromState):
+ * UIProcess/WebBackForwardList.h:
+ * UIProcess/cf/WebBackForwardListCF.cpp:
+ (WebKit::generateWebBackForwardItemID): Deleted.
+
+2014-06-30 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Change the AddBackForwardItem message to take a page state object
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134475
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (170625 => 170626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-07-01 01:06:35 UTC (rev 170625)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-07-01 01:29:38 UTC (rev 170626)
</span><span class="lines">@@ -27,10 +27,24 @@
</span><span class="cx"> #include "WebBackForwardList.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "SessionState.h"
</ins><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+// FIXME: Make this static once WebBackForwardListCF.cpp is no longer using it.
+uint64_t generateWebBackForwardItemID();
+
+uint64_t generateWebBackForwardItemID()
+{
+ // These IDs exist in the UIProcess for items created by the UIProcess.
+ // The IDs generated here need to never collide with the IDs created in WebBackForwardListProxy in the WebProcess.
+ // We accomplish this by starting from 2, and only ever using even ids.
+ static uint64_t uniqueHistoryItemID = 0;
+ uniqueHistoryItemID += 2;
+ return uniqueHistoryItemID;
+}
+
</ins><span class="cx"> static const unsigned DefaultCapacity = 100;
</span><span class="cx">
</span><span class="cx"> WebBackForwardList::WebBackForwardList(WebPageProxy& page)
</span><span class="lines">@@ -366,4 +380,17 @@
</span><span class="cx"> m_page->didChangeBackForwardList(nullptr, std::move(removedItems));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebBackForwardList::restoreFromState(BackForwardListState backForwardListState)
+{
+ Vector<RefPtr<WebBackForwardListItem>> items;
+ items.reserveInitialCapacity(backForwardListState.items.size());
+
+ for (auto& pageState : backForwardListState.items)
+ items.uncheckedAppend(WebBackForwardListItem::create(generateWebBackForwardItemID(), std::move(pageState)));
+
+ m_hasCurrentIndex = !!backForwardListState.currentIndex;
+ m_currentIndex = backForwardListState.currentIndex.valueOr(0);
+ m_entries = std::move(items);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (170625 => 170626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-01 01:06:35 UTC (rev 170625)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-01 01:29:38 UTC (rev 170626)
</span><span class="lines">@@ -38,11 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-/*
- * Current
- * |---------*--------------| Entries
- * Back Forward
- */
</del><ins>+struct BackForwardListState;
</ins><span class="cx">
</span><span class="cx"> class WebBackForwardList : public API::ObjectImpl<API::Object::Type::BackForwardList> {
</span><span class="cx"> public:
</span><span class="lines">@@ -83,6 +79,8 @@
</span><span class="cx"> bool restoreFromV1CFDictionaryRepresentation(CFDictionaryRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void restoreFromState(BackForwardListState);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit WebBackForwardList(WebPageProxy&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscfWebBackForwardListCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp (170625 => 170626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2014-07-01 01:06:35 UTC (rev 170625)
+++ trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2014-07-01 01:29:38 UTC (rev 170626)
</span><span class="lines">@@ -36,15 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static uint64_t generateWebBackForwardItemID()
-{
- // These IDs exist in the UIProcess for items created by the UIProcess.
- // The IDs generated here need to never collide with the IDs created in WebBackForwardListProxy in the WebProcess.
- // We accomplish this by starting from 2, and only ever using even ids.
- static uint64_t uniqueHistoryItemID = 0;
- uniqueHistoryItemID += 2;
- return uniqueHistoryItemID;
-}
</del><ins>+uint64_t generateWebBackForwardItemID();
</ins><span class="cx">
</span><span class="cx"> static CFNumberRef sessionHistoryCurrentVersion()
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>