<!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>[170614] 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/170614">170614</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-30 16:39:43 -0700 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebBackForwardListItem should not store back-forward data
https://bugs.webkit.org/show_bug.cgi?id=134469
Reviewed by Darin Adler.
Change WebBackForwardListItem::backForwardData to encode the main frame state lazily,
and change WebBackForwardListItem::setBackForwardData to decode it into the main frame state.
* Shared/WebBackForwardListItem.cpp:
(WebKit::WebBackForwardListItem::backForwardData):
(WebKit::WebBackForwardListItem::setBackForwardData):
(WebKit::WebBackForwardListItem::encode):
* Shared/WebBackForwardListItem.h:
(WebKit::WebBackForwardListItem::backForwardData): Deleted.
* UIProcess/cf/WebBackForwardListCF.cpp:
(WebKit::WebBackForwardList::createCFDictionaryRepresentation):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::restoreSession):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2UIProcesscfWebBackForwardListCFcpp">trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170613 => 170614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-30 23:26:42 UTC (rev 170613)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-30 23:39:43 UTC (rev 170614)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-06-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ WebBackForwardListItem should not store back-forward data
+ https://bugs.webkit.org/show_bug.cgi?id=134469
+
+ Reviewed by Darin Adler.
+
+ Change WebBackForwardListItem::backForwardData to encode the main frame state lazily,
+ and change WebBackForwardListItem::setBackForwardData to decode it into the main frame state.
+
+ * Shared/WebBackForwardListItem.cpp:
+ (WebKit::WebBackForwardListItem::backForwardData):
+ (WebKit::WebBackForwardListItem::setBackForwardData):
+ (WebKit::WebBackForwardListItem::encode):
+ * Shared/WebBackForwardListItem.h:
+ (WebKit::WebBackForwardListItem::backForwardData): Deleted.
+ * UIProcess/cf/WebBackForwardListCF.cpp:
+ (WebKit::WebBackForwardList::createCFDictionaryRepresentation):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::restoreSession):
+
+2014-06-30 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WebBackForwardListItems should hold on to PageState objects
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134467
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp (170613 => 170614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-06-30 23:26:42 UTC (rev 170613)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-06-30 23:39:43 UTC (rev 170614)
</span><span class="lines">@@ -26,7 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebBackForwardListItem.h"
</span><span class="cx">
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "DataReference.h"
</span><ins>+#include "LegacySessionStateCoding.h"
</ins><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -55,11 +57,14 @@
</span><span class="cx"> return highestUsedItemID;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<API::Data> WebBackForwardListItem::backForwardData() const
+{
+ return encodeLegacySessionHistoryEntryData(m_pageState.mainFrameState);
+}
+
</ins><span class="cx"> void WebBackForwardListItem::setBackForwardData(const uint8_t* data, size_t size)
</span><span class="cx"> {
</span><del>- m_backForwardData.clear();
- m_backForwardData.reserveCapacity(size);
- m_backForwardData.append(data, size);
</del><ins>+ decodeLegacySessionHistoryEntryData(data, size, m_pageState.mainFrameState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebBackForwardListItem::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="lines">@@ -68,7 +73,9 @@
</span><span class="cx"> encoder << m_pageState.mainFrameState.urlString;
</span><span class="cx"> encoder << m_pageState.title;
</span><span class="cx"> encoder << m_itemID;
</span><del>- encoder << IPC::DataReference(m_backForwardData);
</del><ins>+
+ RefPtr<API::Data> backForwardData = this->backForwardData();
+ encoder << IPC::DataReference(backForwardData->bytes(), backForwardData->size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebBackForwardListItem> WebBackForwardListItem::decode(IPC::ArgumentDecoder& decoder)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (170613 => 170614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-06-30 23:26:42 UTC (rev 170613)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-06-30 23:39:43 UTC (rev 170614)
</span><span class="lines">@@ -31,6 +31,10 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+namespace API {
+class Data;
+}
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx"> class ArgumentDecoder;
</span><span class="cx"> class ArgumentEncoder;
</span><span class="lines">@@ -59,7 +63,7 @@
</span><span class="cx"> const String& title() const { return m_pageState.title; }
</span><span class="cx">
</span><span class="cx"> void setBackForwardData(const uint8_t* buffer, size_t size);
</span><del>- const Vector<uint8_t>& backForwardData() const { return m_backForwardData; }
</del><ins>+ PassRefPtr<API::Data> backForwardData() const;
</ins><span class="cx">
</span><span class="cx"> void setSnapshotUUID(const String& uuid) { m_snapshotUUID = uuid; }
</span><span class="cx"> const String& snapshotUUID() const { return m_snapshotUUID; }
</span><span class="lines">@@ -74,7 +78,6 @@
</span><span class="cx">
</span><span class="cx"> PageState m_pageState;
</span><span class="cx"> uint64_t m_itemID;
</span><del>- Vector<uint8_t> m_backForwardData;
</del><span class="cx"> String m_snapshotUUID;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscfWebBackForwardListCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp (170613 => 170614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2014-06-30 23:26:42 UTC (rev 170613)
+++ trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2014-06-30 23:39:43 UTC (rev 170614)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebBackForwardList.h"
</span><span class="cx">
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -109,7 +110,8 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: This uses the IPC data encoding format, which means that whenever we change the IPC encoding we need to bump the CurrentSessionStateDataVersion
</span><span class="cx"> // constant in WebPageProxyCF.cpp. The IPC data format is meant to be an implementation detail, and not something that should be written to disk.
</span><del>- RetainPtr<CFDataRef> entryData = adoptCF(CFDataCreate(kCFAllocatorDefault, m_entries[i]->backForwardData().data(), m_entries[i]->backForwardData().size()));
</del><ins>+ RefPtr<API::Data> backForwardData = m_entries[i]->backForwardData();
+ RetainPtr<CFDataRef> entryData = adoptCF(CFDataCreate(kCFAllocatorDefault, backForwardData->bytes(), backForwardData->size()));
</ins><span class="cx">
</span><span class="cx"> const void* keys[5] = { sessionHistoryEntryURLKey, sessionHistoryEntryTitleKey, sessionHistoryEntryOriginalURLKey, sessionHistoryEntryDataKey, sessionHistoryEntrySnapshotUUIDKey };
</span><span class="cx"> const void* values[5] = { url.get(), title.get(), originalURL.get(), entryData.get(), uuid.get() };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (170613 => 170614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-06-30 23:26:42 UTC (rev 170613)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-06-30 23:39:43 UTC (rev 170614)
</span><span class="lines">@@ -1971,7 +1971,8 @@
</span><span class="cx"> pageState.mainFrameState.urlString = webItem->url();
</span><span class="cx"> pageState.mainFrameState.originalURLString = webItem->originalURL();
</span><span class="cx">
</span><del>- if (!decodeLegacySessionHistoryEntryData(webItem->backForwardData().data(), webItem->backForwardData().size(), pageState.mainFrameState)) {
</del><ins>+ RefPtr<API::Data> backForwardData = webItem->backForwardData();
+ if (!decodeLegacySessionHistoryEntryData(backForwardData->bytes(), backForwardData->size(), pageState.mainFrameState)) {
</ins><span class="cx"> LOG_ERROR("Failed to decode page state.");
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>