<!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>[170649] 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/170649">170649</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-01 10:46:29 -0700 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a BackForwardListItemState struct and put the snapshot UUID there
https://bugs.webkit.org/show_bug.cgi?id=134497
Reviewed by Sam Weinig.
* Shared/SessionState.cpp:
(WebKit::PageState::encode):
(WebKit::PageState::decode):
(WebKit::BackForwardListItemState::encode):
(WebKit::BackForwardListItemState::decode):
* Shared/SessionState.h:
* Shared/WebBackForwardListItem.cpp:
(WebKit::WebBackForwardListItem::create):
(WebKit::WebBackForwardListItem::WebBackForwardListItem):
(WebKit::WebBackForwardListItem::backForwardData):
(WebKit::WebBackForwardListItem::setBackForwardData):
(WebKit::WebBackForwardListItem::encode):
* Shared/WebBackForwardListItem.h:
(WebKit::WebBackForwardListItem::setPageState):
(WebKit::WebBackForwardListItem::setOriginalURL):
(WebKit::WebBackForwardListItem::originalURL):
(WebKit::WebBackForwardListItem::setURL):
(WebKit::WebBackForwardListItem::url):
(WebKit::WebBackForwardListItem::setTitle):
(WebKit::WebBackForwardListItem::title):
(WebKit::WebBackForwardListItem::setSnapshotUUID):
(WebKit::WebBackForwardListItem::snapshotUUID):
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::restoreFromState):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::addBackForwardItem):
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::decodeSessionHistoryEntries):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedSessionStatecpp">trunk/Source/WebKit2/Shared/SessionState.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedSessionStateh">trunk/Source/WebKit2/Shared/SessionState.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBackForwardListItemcpp">trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp</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="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp">trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170648 => 170649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 17:46:29 UTC (rev 170649)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-07-01 Anders Carlsson <andersca@apple.com>
+
+ Add a BackForwardListItemState struct and put the snapshot UUID there
+ https://bugs.webkit.org/show_bug.cgi?id=134497
+
+ Reviewed by Sam Weinig.
+
+ * Shared/SessionState.cpp:
+ (WebKit::PageState::encode):
+ (WebKit::PageState::decode):
+ (WebKit::BackForwardListItemState::encode):
+ (WebKit::BackForwardListItemState::decode):
+ * Shared/SessionState.h:
+ * Shared/WebBackForwardListItem.cpp:
+ (WebKit::WebBackForwardListItem::create):
+ (WebKit::WebBackForwardListItem::WebBackForwardListItem):
+ (WebKit::WebBackForwardListItem::backForwardData):
+ (WebKit::WebBackForwardListItem::setBackForwardData):
+ (WebKit::WebBackForwardListItem::encode):
+ * Shared/WebBackForwardListItem.h:
+ (WebKit::WebBackForwardListItem::setPageState):
+ (WebKit::WebBackForwardListItem::setOriginalURL):
+ (WebKit::WebBackForwardListItem::originalURL):
+ (WebKit::WebBackForwardListItem::setURL):
+ (WebKit::WebBackForwardListItem::url):
+ (WebKit::WebBackForwardListItem::setTitle):
+ (WebKit::WebBackForwardListItem::title):
+ (WebKit::WebBackForwardListItem::setSnapshotUUID):
+ (WebKit::WebBackForwardListItem::snapshotUUID):
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::restoreFromState):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::addBackForwardItem):
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::decodeSessionHistoryEntries):
+
</ins><span class="cx"> 2014-07-01 Yongjun Zhang <yongjun_zhang@apple.com>
</span><span class="cx">
</span><span class="cx"> Add encodeInteger and decodeInteger for remote object encoder and decoder.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SessionState.cpp (170648 => 170649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.cpp 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/Shared/SessionState.cpp 2014-07-01 17:46:29 UTC (rev 170649)
</span><span class="lines">@@ -168,17 +168,33 @@
</span><span class="cx">
</span><span class="cx"> void PageState::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><ins>+ encoder << title;
</ins><span class="cx"> encoder << mainFrameState;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PageState::decode(IPC::ArgumentDecoder& decoder, PageState& result)
</span><span class="cx"> {
</span><ins>+ if (!decoder.decode(result.title))
+ return false;
</ins><span class="cx"> if (!decoder.decode(result.mainFrameState))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void BackForwardListItemState::encode(IPC::ArgumentEncoder& encoder) const
+{
+ encoder << pageState;
+}
+
+bool BackForwardListItemState::decode(IPC::ArgumentDecoder& decoder, BackForwardListItemState& result)
+{
+ if (!decoder.decode(result.pageState))
+ return false;
+
+ return true;
+}
+
</ins><span class="cx"> void BackForwardListState::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << items;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SessionState.h (170648 => 170649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.h 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/Shared/SessionState.h 2014-07-01 17:46:29 UTC (rev 170649)
</span><span class="lines">@@ -113,11 +113,20 @@
</span><span class="cx"> FrameState mainFrameState;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct BackForwardListItemState {
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, BackForwardListItemState&);
+
+ PageState pageState;
+ // FIXME: This should hold the snapshot itself, not its UUID.
+ String snapshotUUID;
+};
+
</ins><span class="cx"> struct BackForwardListState {
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, BackForwardListState&);
</span><span class="cx">
</span><del>- Vector<PageState> items;
</del><ins>+ Vector<BackForwardListItemState> items;
</ins><span class="cx"> Optional<uint32_t> currentIndex;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp (170648 => 170649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-07-01 17:46:29 UTC (rev 170649)
</span><span class="lines">@@ -35,23 +35,23 @@
</span><span class="cx">
</span><span class="cx"> static uint64_t highestUsedItemID = 0;
</span><span class="cx">
</span><del>-PassRefPtr<WebBackForwardListItem> WebBackForwardListItem::create(uint64_t itemID, PageState pageState)
</del><ins>+PassRefPtr<WebBackForwardListItem> WebBackForwardListItem::create(uint64_t itemID, BackForwardListItemState backForwardListItemState)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebBackForwardListItem(itemID, std::move(pageState)));
</del><ins>+ return adoptRef(new WebBackForwardListItem(itemID, std::move(backForwardListItemState)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebBackForwardListItem::WebBackForwardListItem(uint64_t itemID, PageState pageState)
</del><ins>+WebBackForwardListItem::WebBackForwardListItem(uint64_t itemID, BackForwardListItemState backForwardListItemState)
</ins><span class="cx"> : m_itemID(itemID)
</span><del>- , m_pageState(std::move(pageState))
</del><ins>+ , m_itemState(std::move(backForwardListItemState))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebBackForwardListItem::WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
</span><span class="cx"> : m_itemID(itemID)
</span><span class="cx"> {
</span><del>- m_pageState.mainFrameState.originalURLString = originalURL;
- m_pageState.mainFrameState.urlString = url;
- m_pageState.title = title;
</del><ins>+ m_itemState.pageState.mainFrameState.originalURLString = originalURL;
+ m_itemState.pageState.mainFrameState.urlString = url;
+ m_itemState.pageState.title = title;
</ins><span class="cx">
</span><span class="cx"> if (m_itemID > highestUsedItemID)
</span><span class="cx"> highestUsedItemID = m_itemID;
</span><span class="lines">@@ -70,19 +70,19 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<API::Data> WebBackForwardListItem::backForwardData() const
</span><span class="cx"> {
</span><del>- return encodeLegacySessionHistoryEntryData(m_pageState.mainFrameState);
</del><ins>+ return encodeLegacySessionHistoryEntryData(m_itemState.pageState.mainFrameState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebBackForwardListItem::setBackForwardData(const uint8_t* data, size_t size)
</span><span class="cx"> {
</span><del>- decodeLegacySessionHistoryEntryData(data, size, m_pageState.mainFrameState);
</del><ins>+ decodeLegacySessionHistoryEntryData(data, size, m_itemState.pageState.mainFrameState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebBackForwardListItem::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><del>- encoder << m_pageState.mainFrameState.originalURLString;
- encoder << m_pageState.mainFrameState.urlString;
- encoder << m_pageState.title;
</del><ins>+ encoder << m_itemState.pageState.mainFrameState.originalURLString;
+ encoder << m_itemState.pageState.mainFrameState.urlString;
+ encoder << m_itemState.pageState.title;
</ins><span class="cx"> encoder << m_itemID;
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Data> backForwardData = this->backForwardData();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (170648 => 170649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-01 17:46:29 UTC (rev 170649)
</span><span class="lines">@@ -42,11 +42,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-struct PageState;
-
</del><span class="cx"> class WebBackForwardListItem : public API::ObjectImpl<API::Object::Type::BackForwardListItem> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<WebBackForwardListItem> create(uint64_t itemID, PageState);
</del><ins>+ static PassRefPtr<WebBackForwardListItem> create(uint64_t itemID, BackForwardListItemState);
</ins><span class="cx">
</span><span class="cx"> static PassRefPtr<WebBackForwardListItem> create(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
</span><span class="cx"> {
</span><span class="lines">@@ -57,22 +55,22 @@
</span><span class="cx">
</span><span class="cx"> uint64_t itemID() const { return m_itemID; }
</span><span class="cx">
</span><del>- void setPageState(PageState pageState) { m_pageState = std::move(pageState); }
</del><ins>+ void setPageState(PageState pageState) { m_itemState.pageState = std::move(pageState); }
</ins><span class="cx">
</span><del>- void setOriginalURL(const String& originalURL) { m_pageState.mainFrameState.originalURLString = originalURL; }
- const String& originalURL() const { return m_pageState.mainFrameState.originalURLString; }
</del><ins>+ void setOriginalURL(const String& originalURL) { m_itemState.pageState.mainFrameState.originalURLString = originalURL; }
+ const String& originalURL() const { return m_itemState.pageState.mainFrameState.originalURLString; }
</ins><span class="cx">
</span><del>- void setURL(const String& url) { m_pageState.mainFrameState.urlString = url; }
- const String& url() const { return m_pageState.mainFrameState.urlString; }
</del><ins>+ void setURL(const String& url) { m_itemState.pageState.mainFrameState.urlString = url; }
+ const String& url() const { return m_itemState.pageState.mainFrameState.urlString; }
</ins><span class="cx">
</span><del>- void setTitle(const String& title) { m_pageState.title = title; }
- const String& title() const { return m_pageState.title; }
</del><ins>+ void setTitle(const String& title) { m_itemState.pageState.title = title; }
+ const String& title() const { return m_itemState.pageState.title; }
</ins><span class="cx">
</span><span class="cx"> void setBackForwardData(const uint8_t* buffer, size_t size);
</span><span class="cx"> PassRefPtr<API::Data> backForwardData() const;
</span><span class="cx">
</span><del>- void setSnapshotUUID(const String& uuid) { m_snapshotUUID = uuid; }
- const String& snapshotUUID() const { return m_snapshotUUID; }
</del><ins>+ void setSnapshotUUID(const String& uuid) { m_itemState.snapshotUUID = uuid; }
+ const String& snapshotUUID() const { return m_itemState.snapshotUUID; }
</ins><span class="cx">
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static PassRefPtr<WebBackForwardListItem> decode(IPC::ArgumentDecoder&);
</span><span class="lines">@@ -80,13 +78,12 @@
</span><span class="cx"> static uint64_t highedUsedItemID();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebBackForwardListItem(uint64_t itemID, PageState);
</del><ins>+ WebBackForwardListItem(uint64_t itemID, BackForwardListItemState);
</ins><span class="cx">
</span><span class="cx"> WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID);
</span><span class="cx">
</span><span class="cx"> uint64_t m_itemID;
</span><del>- PageState m_pageState;
- String m_snapshotUUID;
</del><ins>+ BackForwardListItemState m_itemState;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<WebBackForwardListItem>> BackForwardListItemVector;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (170648 => 170649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-07-01 17:46:29 UTC (rev 170649)
</span><span class="lines">@@ -385,8 +385,8 @@
</span><span class="cx"> Vector<RefPtr<WebBackForwardListItem>> items;
</span><span class="cx"> items.reserveInitialCapacity(backForwardListState.items.size());
</span><span class="cx">
</span><del>- for (auto& pageState : backForwardListState.items)
- items.uncheckedAppend(WebBackForwardListItem::create(generateWebBackForwardItemID(), std::move(pageState)));
</del><ins>+ for (auto& backForwardListItemState : backForwardListState.items)
+ items.uncheckedAppend(WebBackForwardListItem::create(generateWebBackForwardItemID(), std::move(backForwardListItemState)));
</ins><span class="cx">
</span><span class="cx"> m_hasCurrentIndex = !!backForwardListState.currentIndex;
</span><span class="cx"> m_currentIndex = backForwardListState.currentIndex.valueOr(0);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (170648 => 170649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-07-01 17:46:29 UTC (rev 170649)
</span><span class="lines">@@ -317,7 +317,9 @@
</span><span class="cx">
</span><span class="cx"> auto& backForwardListItem = m_backForwardListItemMap.add(itemID, nullptr).iterator->value;
</span><span class="cx"> if (!backForwardListItem) {
</span><del>- backForwardListItem = WebBackForwardListItem::create(itemID, pageState);
</del><ins>+ BackForwardListItemState backForwardListItemState;
+ backForwardListItemState.pageState = pageState;
+ backForwardListItem = WebBackForwardListItem::create(itemID, std::move(backForwardListItemState));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170648 => 170649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 17:46:29 UTC (rev 170649)
</span><span class="lines">@@ -844,15 +844,15 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool decodeSessionHistoryEntries(CFArrayRef entriesArray, Vector<PageState>& entries)
</del><ins>+static bool decodeSessionHistoryEntries(CFArrayRef entriesArray, Vector<BackForwardListItemState>& entries)
</ins><span class="cx"> {
</span><span class="cx"> for (CFIndex i = 0, size = CFArrayGetCount(entriesArray); i < size; ++i) {
</span><span class="cx"> auto entryDictionary = dynamic_cf_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(entriesArray, i));
</span><span class="cx"> if (!entryDictionary)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- PageState entry;
- if (!decodeSessionHistoryEntry(entryDictionary, entry))
</del><ins>+ BackForwardListItemState entry;
+ if (!decodeSessionHistoryEntry(entryDictionary, entry.pageState))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> entries.append(std::move(entry));
</span></span></pre>
</div>
</div>
</body>
</html>