<!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>[170654] 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/170654">170654</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-01 12:04:54 -0700 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a encodeLegacySessionState function
https://bugs.webkit.org/show_bug.cgi?id=134502
Reviewed by Tim Horton.
* UIProcess/LegacySessionStateCoding.h:
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeSessionHistoryEntryData):
(WebKit::encodeLegacySessionHistoryEntryData):
(WebKit::createDictionary):
(WebKit::encodeSessionHistory):
(WebKit::encodeLegacySessionState):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLegacySessionStateCodingh">trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h</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 (170653 => 170654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-01 18:41:27 UTC (rev 170653)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 19:04:54 UTC (rev 170654)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-01 Anders Carlsson <andersca@apple.com>
+
+ Add a encodeLegacySessionState function
+ https://bugs.webkit.org/show_bug.cgi?id=134502
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/LegacySessionStateCoding.h:
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::encodeSessionHistoryEntryData):
+ (WebKit::encodeLegacySessionHistoryEntryData):
+ (WebKit::createDictionary):
+ (WebKit::encodeSessionHistory):
+ (WebKit::encodeLegacySessionState):
+
</ins><span class="cx"> 2014-07-01 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] WebProcess doesn't follow localization of UI process when run as a service
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLegacySessionStateCodingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h (170653 => 170654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h 2014-07-01 18:41:27 UTC (rev 170653)
+++ trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h 2014-07-01 19:04:54 UTC (rev 170654)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> struct FrameState;
</span><span class="cx"> struct SessionState;
</span><span class="cx">
</span><ins>+RefPtr<API::Data> encodeLegacySessionState(const SessionState&);
</ins><span class="cx"> RefPtr<API::Data> encodeLegacySessionHistoryEntryData(const FrameState&);
</span><span class="cx">
</span><span class="cx"> bool decodeLegacySessionState(const API::Data&, SessionState&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170653 => 170654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 18:41:27 UTC (rev 170653)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 19:04:54 UTC (rev 170654)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx"> static const CFStringRef provisionalURLKey = CFSTR("ProvisionalURL");
</span><span class="cx">
</span><span class="cx"> // Session history keys.
</span><ins>+static const uint32_t sessionHistoryVersion = 1;
+
</ins><span class="cx"> static const CFStringRef sessionHistoryVersionKey = CFSTR("SessionHistoryVersion");
</span><span class="cx"> static const CFStringRef sessionHistoryCurrentIndexKey = CFSTR("SessionHistoryCurrentIndex");
</span><span class="cx"> static const CFStringRef sessionHistoryEntriesKey = CFSTR("SessionHistoryEntries");
</span><span class="lines">@@ -353,7 +355,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static MallocPtr<uint8_t> encodeLegacySessionHistoryEntryData(const FrameState& frameState, size_t& bufferSize)
</del><ins>+static MallocPtr<uint8_t> encodeSessionHistoryEntryData(const FrameState& frameState, size_t& bufferSize)
</ins><span class="cx"> {
</span><span class="cx"> HistoryEntryDataEncoder encoder;
</span><span class="cx">
</span><span class="lines">@@ -366,13 +368,105 @@
</span><span class="cx"> RefPtr<API::Data> encodeLegacySessionHistoryEntryData(const FrameState& frameState)
</span><span class="cx"> {
</span><span class="cx"> size_t bufferSize;
</span><del>- auto buffer = encodeLegacySessionHistoryEntryData(frameState, bufferSize);
</del><ins>+ auto buffer = encodeSessionHistoryEntryData(frameState, bufferSize);
</ins><span class="cx">
</span><span class="cx"> return API::Data::createWithoutCopying(buffer.leakPtr(), bufferSize, [] (unsigned char* buffer, const void* context) {
</span><span class="cx"> fastFree(buffer);
</span><span class="cx"> }, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RetainPtr<CFDataRef> encodeSessionHistoryEntryData(const FrameState& frameState)
+{
+
+ return nullptr;
+}
+
+static RetainPtr<CFDictionaryRef> createDictionary(std::initializer_list<std::pair<CFStringRef, CFTypeRef>> keyValuePairs)
+{
+ Vector<CFTypeRef> keys;
+ Vector<CFTypeRef> values;
+
+ keys.reserveInitialCapacity(keyValuePairs.size());
+ values.reserveInitialCapacity(keyValuePairs.size());
+
+ for (const auto& keyValuePair : keyValuePairs) {
+ keys.uncheckedAppend(keyValuePair.first);
+ keys.uncheckedAppend(keyValuePair.second);
+ }
+
+ return adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys.data(), values.data(), keyValuePairs.size(), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+}
+
+static RetainPtr<CFDictionaryRef> encodeSessionHistory(const BackForwardListState& backForwardListState)
+{
+ ASSERT(!backForwardListState.currentIndex || backForwardListState.currentIndex.value() < backForwardListState.items.size());
+
+ auto sessionHistoryVersionNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &sessionHistoryVersion));
+
+ if (!backForwardListState.currentIndex)
+ return createDictionary({ { sessionHistoryVersionKey, sessionHistoryVersionNumber.get() } });
+
+ auto entries = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, backForwardListState.items.size(), &kCFTypeArrayCallBacks));
+
+ for (const auto& item : backForwardListState.items) {
+ auto url = item.pageState.mainFrameState.urlString.createCFString();
+ auto title = item.pageState.title.createCFString();
+ auto originalURL = item.pageState.mainFrameState.originalURLString.createCFString();
+ auto data = encodeSessionHistoryEntryData(item.pageState.mainFrameState);
+
+ auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleKey, title.get() }, { sessionHistoryEntryDataKey, data.get() }});
+
+ CFArrayAppendValue(entries.get(), entryDictionary.get());
+ }
+
+ uint32_t currentIndex = backForwardListState.currentIndex.value();
+ auto currentIndexNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &currentIndex));
+
+ return createDictionary({ { sessionHistoryVersionKey, sessionHistoryVersionNumber.get() }, { sessionHistoryCurrentIndexKey, currentIndexNumber.get() }, { sessionHistoryEntriesKey, entries.get() } });
+}
+
+RefPtr<API::Data> encodeLegacySessionState(const SessionState& sessionState)
+{
+ auto sessionHistoryDictionary = encodeSessionHistory(sessionState.backForwardListState);
+ auto provisionalURLString = sessionState.provisionalURL.string().createCFString();
+
+ RetainPtr<CFDictionaryRef> stateDictionary;
+ if (provisionalURLString)
+ stateDictionary = createDictionary({ { sessionHistoryKey, sessionHistoryDictionary.get() }, { provisionalURLKey, provisionalURLString.get() } });
+ else
+ stateDictionary = createDictionary({ { sessionHistoryKey, sessionHistoryDictionary.get() } });
+
+ auto writeStream = adoptCF(CFWriteStreamCreateWithAllocatedBuffers(kCFAllocatorDefault, nullptr));
+ if (!writeStream)
+ return nullptr;
+
+ if (!CFWriteStreamOpen(writeStream.get()))
+ return nullptr;
+
+ if (!CFPropertyListWrite(stateDictionary.get(), writeStream.get(), kCFPropertyListBinaryFormat_v1_0, 0, nullptr))
+ return nullptr;
+
+ auto data = adoptCF(static_cast<CFDataRef>(CFWriteStreamCopyProperty(writeStream.get(), kCFStreamPropertyDataWritten)));
+
+ CFIndex length = CFDataGetLength(data.get());
+
+ size_t bufferSize = length + sizeof(uint32_t);
+ auto buffer = MallocPtr<uint8_t>::malloc(bufferSize);
+
+ // Put the session state version number at the start of the buffer
+ buffer.get()[0] = (sessionStateDataVersion & 0xff000000) >> 24;
+ buffer.get()[1] = (sessionStateDataVersion & 0x00ff0000) >> 16;
+ buffer.get()[2] = (sessionStateDataVersion & 0x0000ff00) >> 8;
+ buffer.get()[3] = (sessionStateDataVersion & 0x000000ff);
+
+ // Copy in the actual session state data
+ CFDataGetBytes(data.get(), CFRangeMake(0, length), buffer.get() + sizeof(uint32_t));
+
+ return API::Data::createWithoutCopying(buffer.leakPtr(), bufferSize, [] (unsigned char* buffer, const void* context) {
+ fastFree(buffer);
+ }, nullptr);
+}
+
</ins><span class="cx"> class HistoryEntryDataDecoder {
</span><span class="cx"> public:
</span><span class="cx"> HistoryEntryDataDecoder(const uint8_t* buffer, size_t bufferSize)
</span></span></pre>
</div>
</div>
</body>
</html>