<!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>[170403] 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/170403">170403</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-24 16:33:03 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify decodeLegacySessionState
https://bugs.webkit.org/show_bug.cgi?id=134280
Reviewed by Andreas Kling.
There's no need to use a LegacySessionStateDecoder object with a single member,
just make all functions static and only export a single entry point; decodeLegacySessionState.
No functionality change, just moving code around.
* UIProcess/API/C/WKSessionStateRef.cpp:
(WKSessionStateCreateFromData):
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::decodeSessionHistoryEntryData):
(WebKit::decodeSessionHistoryEntry):
(WebKit::decodeSessionHistoryEntries):
(WebKit::decodeV0SessionHistory):
(WebKit::decodeV1SessionHistory):
(WebKit::decodeSessionHistory):
(WebKit::decodeLegacySessionState):
(WebKit::LegacySessionStateDecoder::LegacySessionStateDecoder): Deleted.
(WebKit::LegacySessionStateDecoder::~LegacySessionStateDecoder): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionState): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionHistory): Deleted.
(WebKit::LegacySessionStateDecoder::decodeV0SessionHistory): Deleted.
(WebKit::LegacySessionStateDecoder::decodeV1SessionHistory): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntries): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntry): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntryData): Deleted.
* UIProcess/mac/LegacySessionStateCoding.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKSessionStateRefcpp">trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp">trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacLegacySessionStateCodingh">trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170402 => 170403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-24 23:32:31 UTC (rev 170402)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-24 23:33:03 UTC (rev 170403)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-06-24 Anders Carlsson <andersca@apple.com>
+
+ Simplify decodeLegacySessionState
+ https://bugs.webkit.org/show_bug.cgi?id=134280
+
+ Reviewed by Andreas Kling.
+
+ There's no need to use a LegacySessionStateDecoder object with a single member,
+ just make all functions static and only export a single entry point; decodeLegacySessionState.
+
+ No functionality change, just moving code around.
+
+ * UIProcess/API/C/WKSessionStateRef.cpp:
+ (WKSessionStateCreateFromData):
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::decodeSessionHistoryEntryData):
+ (WebKit::decodeSessionHistoryEntry):
+ (WebKit::decodeSessionHistoryEntries):
+ (WebKit::decodeV0SessionHistory):
+ (WebKit::decodeV1SessionHistory):
+ (WebKit::decodeSessionHistory):
+ (WebKit::decodeLegacySessionState):
+ (WebKit::LegacySessionStateDecoder::LegacySessionStateDecoder): Deleted.
+ (WebKit::LegacySessionStateDecoder::~LegacySessionStateDecoder): Deleted.
+ (WebKit::LegacySessionStateDecoder::decodeSessionState): Deleted.
+ (WebKit::LegacySessionStateDecoder::decodeSessionHistory): Deleted.
+ (WebKit::LegacySessionStateDecoder::decodeV0SessionHistory): Deleted.
+ (WebKit::LegacySessionStateDecoder::decodeV1SessionHistory): Deleted.
+ (WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntries): Deleted.
+ (WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntry): Deleted.
+ (WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntryData): Deleted.
+ * UIProcess/mac/LegacySessionStateCoding.h:
+
</ins><span class="cx"> 2014-06-24 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable GAMEPAD in the Mac build, but disabled at runtime.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKSessionStateRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp (170402 => 170403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp 2014-06-24 23:32:31 UTC (rev 170402)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp 2014-06-24 23:33:03 UTC (rev 170403)
</span><span class="lines">@@ -33,10 +33,8 @@
</span><span class="cx">
</span><span class="cx"> WKSessionStateRef WKSessionStateCreateFromData(WKDataRef data)
</span><span class="cx"> {
</span><del>- WebKit::LegacySessionStateDecoder decoder { WebKit::toImpl(data) };
-
</del><span class="cx"> WebKit::SessionState sessionState;
</span><del>- if (!decoder.decodeSessionState(sessionState))
</del><ins>+ if (!WebKit::decodeLegacySessionState(*WebKit::toImpl(data), sessionState))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return WebKit::toAPI(API::SessionState::create(std::move(sessionState)).leakRef());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170402 => 170403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-24 23:32:31 UTC (rev 170402)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-24 23:33:03 UTC (rev 170403)
</span><span class="lines">@@ -53,181 +53,6 @@
</span><span class="cx"> // Session history entry data.
</span><span class="cx"> const uint32_t sessionHistoryEntryDataVersion = 2;
</span><span class="cx">
</span><del>-LegacySessionStateDecoder::LegacySessionStateDecoder(API::Data* data)
- : m_data(data)
-{
-}
-
-LegacySessionStateDecoder::~LegacySessionStateDecoder()
-{
-}
-
-bool LegacySessionStateDecoder::decodeSessionState(SessionState& sessionState) const
-{
- if (!m_data)
- return false;
-
- size_t size = m_data->size();
- const uint8_t* bytes = m_data->bytes();
-
- if (size < sizeof(uint32_t))
- return false;
-
- uint32_t versionNumber = (bytes[0] << 24) + (bytes[1] << 16) + (bytes[2] << 8) + bytes[3];
-
- if (versionNumber != sessionStateDataVersion)
- return false;
-
- auto data = adoptCF(CFDataCreate(kCFAllocatorDefault, bytes + sizeof(uint32_t), size - sizeof(uint32_t)));
-
- auto sessionStateDictionary = adoptCF(dynamic_cf_cast<CFDictionaryRef>(CFPropertyListCreateWithData(kCFAllocatorDefault, data.get(), kCFPropertyListImmutable, nullptr, nullptr)));
- if (!sessionStateDictionary)
- return false;
-
- if (auto backForwardListDictionary = dynamic_cf_cast<CFDictionaryRef>(CFDictionaryGetValue(sessionStateDictionary.get(), sessionHistoryKey))) {
- if (!decodeSessionHistory(backForwardListDictionary, sessionState.backForwardListState))
- return false;
- }
-
- if (auto provisionalURLString = dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(sessionStateDictionary.get(), provisionalURLKey))) {
- sessionState.provisionalURL = WebCore::URL(WebCore::URL(), provisionalURLString);
- if (!sessionState.provisionalURL.isValid())
- return false;
- }
-
- return true;
-}
-
-bool LegacySessionStateDecoder::decodeSessionHistory(CFDictionaryRef backForwardListDictionary, BackForwardListState& backForwardListState) const
-{
- auto sessionHistoryVersionNumber = dynamic_cf_cast<CFNumberRef>(CFDictionaryGetValue(backForwardListDictionary, sessionHistoryVersionKey));
- if (!sessionHistoryVersionNumber) {
- // Version 0 session history dictionaries did not contain a version number.
- return decodeV0SessionHistory(backForwardListDictionary, backForwardListState);
- }
-
- CFIndex sessionHistoryVersion;
- if (!CFNumberGetValue(sessionHistoryVersionNumber, kCFNumberCFIndexType, &sessionHistoryVersion))
- return false;
-
- if (sessionHistoryVersion == 1)
- return decodeV1SessionHistory(backForwardListDictionary, backForwardListState);
-
- return false;
-}
-
-bool LegacySessionStateDecoder::decodeV0SessionHistory(CFDictionaryRef sessionHistoryDictionary, BackForwardListState& backForwardListState) const
-{
- auto currentIndexNumber = dynamic_cf_cast<CFNumberRef>(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryCurrentIndexKey));
- if (!currentIndexNumber)
- return false;
-
- CFIndex currentIndex;
- if (!CFNumberGetValue(currentIndexNumber, kCFNumberCFIndexType, &currentIndex))
- return false;
-
- if (currentIndex < -1)
- return false;
-
- auto historyEntries = dynamic_cf_cast<CFArrayRef>(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryEntriesKey));
- if (!historyEntries)
- return false;
-
- // Version 0 session history relied on currentIndex == -1 to represent the same thing as not having a current index.
- bool hasCurrentIndex = currentIndex != -1;
-
- if (!decodeSessionHistoryEntries(historyEntries, backForwardListState.items))
- return false;
-
- if (!hasCurrentIndex && CFArrayGetCount(historyEntries))
- return false;
-
- if (hasCurrentIndex) {
- if (static_cast<uint32_t>(currentIndex) >= backForwardListState.items.size())
- return false;
-
- backForwardListState.currentIndex = static_cast<uint32_t>(currentIndex);
- }
-
- return true;
-}
-
-bool LegacySessionStateDecoder::decodeV1SessionHistory(CFDictionaryRef sessionHistoryDictionary, BackForwardListState& backForwardListState) const
-{
- auto currentIndexNumber = dynamic_cf_cast<CFNumberRef>(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryCurrentIndexKey));
- if (!currentIndexNumber) {
- // No current index means the dictionary represents an empty session.
- backForwardListState.currentIndex = 0;
- backForwardListState.items = { };
- return true;
- }
-
- CFIndex currentIndex;
- if (!CFNumberGetValue(currentIndexNumber, kCFNumberCFIndexType, &currentIndex))
- return false;
-
- if (currentIndex < 0)
- return false;
-
- auto historyEntries = dynamic_cf_cast<CFArrayRef>(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryEntriesKey));
- if (!historyEntries)
- return false;
-
- if (!decodeSessionHistoryEntries(historyEntries, backForwardListState.items))
- return false;
-
- backForwardListState.currentIndex = static_cast<uint32_t>(currentIndex);
- if (static_cast<uint32_t>(currentIndex) >= backForwardListState.items.size())
- return false;
-
- return true;
-}
-
-bool LegacySessionStateDecoder::decodeSessionHistoryEntries(CFArrayRef entriesArray, Vector<PageState>& entries) const
-{
- for (CFIndex i = 0, size = CFArrayGetCount(entriesArray); i < size; ++i) {
- auto entryDictionary = dynamic_cf_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(entriesArray, i));
- if (!entryDictionary)
- return false;
-
- PageState entry;
- if (!decodeSessionHistoryEntry(entryDictionary, entry))
- return false;
-
- entries.append(std::move(entry));
- }
-
- return true;
-}
-
-bool LegacySessionStateDecoder::decodeSessionHistoryEntry(CFDictionaryRef entryDictionary, PageState& pageState) const
-{
- auto title = dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(entryDictionary, sessionHistoryEntryTitleKey));
- if (!title)
- return false;
-
- auto urlString = dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(entryDictionary, sessionHistoryEntryURLKey));
- if (!urlString)
- return false;
-
- auto originalURLString = dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(entryDictionary, sessionHistoryEntryOriginalURLKey));
- if (!originalURLString)
- return false;
-
- auto historyEntryData = dynamic_cf_cast<CFDataRef>(CFDictionaryGetValue(entryDictionary, sessionHistoryEntryDataKey));
- if (!historyEntryData)
- return false;
-
- if (!decodeSessionHistoryEntryData(historyEntryData, pageState.mainFrameState))
- return false;
-
- pageState.title = title;
- pageState.mainFrameState.urlString = urlString;
- pageState.mainFrameState.originalURLString = originalURLString;
-
- return true;
-}
-
</del><span class="cx"> template<typename T> void isValidEnum(T);
</span><span class="cx">
</span><span class="cx"> class HistoryEntryDataDecoder {
</span><span class="lines">@@ -671,7 +496,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool LegacySessionStateDecoder::decodeSessionHistoryEntryData(CFDataRef historyEntryData, FrameState& mainFrameState) const
</del><ins>+static bool decodeSessionHistoryEntryData(CFDataRef historyEntryData, FrameState& mainFrameState)
</ins><span class="cx"> {
</span><span class="cx"> HistoryEntryDataDecoder decoder { CFDataGetBytePtr(historyEntryData), static_cast<size_t>(CFDataGetLength(historyEntryData)) };
</span><span class="cx">
</span><span class="lines">@@ -686,5 +511,165 @@
</span><span class="cx"> return decoder.finishDecoding();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool decodeSessionHistoryEntry(CFDictionaryRef entryDictionary, PageState& pageState)
+{
+ auto title = dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(entryDictionary, sessionHistoryEntryTitleKey));
+ if (!title)
+ return false;
</ins><span class="cx">
</span><ins>+ auto urlString = dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(entryDictionary, sessionHistoryEntryURLKey));
+ if (!urlString)
+ return false;
+
+ auto originalURLString = dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(entryDictionary, sessionHistoryEntryOriginalURLKey));
+ if (!originalURLString)
+ return false;
+
+ auto historyEntryData = dynamic_cf_cast<CFDataRef>(CFDictionaryGetValue(entryDictionary, sessionHistoryEntryDataKey));
+ if (!historyEntryData)
+ return false;
+
+ if (!decodeSessionHistoryEntryData(historyEntryData, pageState.mainFrameState))
+ return false;
+
+ pageState.title = title;
+ pageState.mainFrameState.urlString = urlString;
+ pageState.mainFrameState.originalURLString = originalURLString;
+
+ return true;
+}
+
+static bool decodeSessionHistoryEntries(CFArrayRef entriesArray, Vector<PageState>& entries)
+{
+ for (CFIndex i = 0, size = CFArrayGetCount(entriesArray); i < size; ++i) {
+ auto entryDictionary = dynamic_cf_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(entriesArray, i));
+ if (!entryDictionary)
+ return false;
+
+ PageState entry;
+ if (!decodeSessionHistoryEntry(entryDictionary, entry))
+ return false;
+
+ entries.append(std::move(entry));
+ }
+
+ return true;
+}
+
+static bool decodeV0SessionHistory(CFDictionaryRef sessionHistoryDictionary, BackForwardListState& backForwardListState)
+{
+ auto currentIndexNumber = dynamic_cf_cast<CFNumberRef>(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryCurrentIndexKey));
+ if (!currentIndexNumber)
+ return false;
+
+ CFIndex currentIndex;
+ if (!CFNumberGetValue(currentIndexNumber, kCFNumberCFIndexType, &currentIndex))
+ return false;
+
+ if (currentIndex < -1)
+ return false;
+
+ auto historyEntries = dynamic_cf_cast<CFArrayRef>(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryEntriesKey));
+ if (!historyEntries)
+ return false;
+
+ // Version 0 session history relied on currentIndex == -1 to represent the same thing as not having a current index.
+ bool hasCurrentIndex = currentIndex != -1;
+
+ if (!decodeSessionHistoryEntries(historyEntries, backForwardListState.items))
+ return false;
+
+ if (!hasCurrentIndex && CFArrayGetCount(historyEntries))
+ return false;
+
+ if (hasCurrentIndex) {
+ if (static_cast<uint32_t>(currentIndex) >= backForwardListState.items.size())
+ return false;
+
+ backForwardListState.currentIndex = static_cast<uint32_t>(currentIndex);
+ }
+
+ return true;
+}
+
+static bool decodeV1SessionHistory(CFDictionaryRef sessionHistoryDictionary, BackForwardListState& backForwardListState)
+{
+ auto currentIndexNumber = dynamic_cf_cast<CFNumberRef>(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryCurrentIndexKey));
+ if (!currentIndexNumber) {
+ // No current index means the dictionary represents an empty session.
+ backForwardListState.currentIndex = 0;
+ backForwardListState.items = { };
+ return true;
+ }
+
+ CFIndex currentIndex;
+ if (!CFNumberGetValue(currentIndexNumber, kCFNumberCFIndexType, &currentIndex))
+ return false;
+
+ if (currentIndex < 0)
+ return false;
+
+ auto historyEntries = dynamic_cf_cast<CFArrayRef>(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryEntriesKey));
+ if (!historyEntries)
+ return false;
+
+ if (!decodeSessionHistoryEntries(historyEntries, backForwardListState.items))
+ return false;
+
+ backForwardListState.currentIndex = static_cast<uint32_t>(currentIndex);
+ if (static_cast<uint32_t>(currentIndex) >= backForwardListState.items.size())
+ return false;
+
+ return true;
+}
+
+static bool decodeSessionHistory(CFDictionaryRef backForwardListDictionary, BackForwardListState& backForwardListState)
+{
+ auto sessionHistoryVersionNumber = dynamic_cf_cast<CFNumberRef>(CFDictionaryGetValue(backForwardListDictionary, sessionHistoryVersionKey));
+ if (!sessionHistoryVersionNumber) {
+ // Version 0 session history dictionaries did not contain a version number.
+ return decodeV0SessionHistory(backForwardListDictionary, backForwardListState);
+ }
+
+ CFIndex sessionHistoryVersion;
+ if (!CFNumberGetValue(sessionHistoryVersionNumber, kCFNumberCFIndexType, &sessionHistoryVersion))
+ return false;
+
+ if (sessionHistoryVersion == 1)
+ return decodeV1SessionHistory(backForwardListDictionary, backForwardListState);
+
+ return false;
+}
+
+bool decodeLegacySessionState(const API::Data& data, SessionState& sessionState)
+{
+ size_t size = data.size();
+ const uint8_t* bytes = data.bytes();
+
+ if (size < sizeof(uint32_t))
+ return false;
+
+ uint32_t versionNumber = (bytes[0] << 24) + (bytes[1] << 16) + (bytes[2] << 8) + bytes[3];
+
+ if (versionNumber != sessionStateDataVersion)
+ return false;
+
+ auto sessionStateDictionary = adoptCF(dynamic_cf_cast<CFDictionaryRef>(CFPropertyListCreateWithData(kCFAllocatorDefault, adoptCF(CFDataCreate(kCFAllocatorDefault, bytes + sizeof(uint32_t), size - sizeof(uint32_t))).get(), kCFPropertyListImmutable, nullptr, nullptr)));
+ if (!sessionStateDictionary)
+ return false;
+
+ if (auto backForwardListDictionary = dynamic_cf_cast<CFDictionaryRef>(CFDictionaryGetValue(sessionStateDictionary.get(), sessionHistoryKey))) {
+ if (!decodeSessionHistory(backForwardListDictionary, sessionState.backForwardListState))
+ return false;
+ }
+
+ if (auto provisionalURLString = dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(sessionStateDictionary.get(), provisionalURLKey))) {
+ sessionState.provisionalURL = WebCore::URL(WebCore::URL(), provisionalURLString);
+ if (!sessionState.provisionalURL.isValid())
+ return false;
+ }
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.h (170402 => 170403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.h 2014-06-24 23:32:31 UTC (rev 170402)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.h 2014-06-24 23:33:03 UTC (rev 170403)
</span><span class="lines">@@ -34,30 +34,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-struct BackForwardListState;
-struct FrameState;
-struct PageState;
</del><span class="cx"> struct SessionState;
</span><span class="cx">
</span><del>-class LegacySessionStateDecoder {
-public:
- explicit LegacySessionStateDecoder(API::Data*);
- ~LegacySessionStateDecoder();
</del><ins>+bool decodeLegacySessionState(const API::Data&, SessionState&);
</ins><span class="cx">
</span><del>- bool decodeSessionState(SessionState&) const;
-
-private:
- bool decodeSessionHistory(CFDictionaryRef, BackForwardListState&) const;
- bool decodeV0SessionHistory(CFDictionaryRef, BackForwardListState&) const;
- bool decodeV1SessionHistory(CFDictionaryRef, BackForwardListState&) const;
-
- bool decodeSessionHistoryEntries(CFArrayRef, Vector<PageState>&) const;
- bool decodeSessionHistoryEntry(CFDictionaryRef, PageState&) const;
- bool decodeSessionHistoryEntryData(CFDataRef, FrameState&) const;
-
- API::Data* m_data;
-};
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // LegacySessionStateCoding_h
</span></span></pre>
</div>
</div>
</body>
</html>