<!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>[170250] 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/170250">170250</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-21 12:41:31 -0700 (Sat, 21 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Begin work on decoding the back/forward tree
https://bugs.webkit.org/show_bug.cgi?id=134161
Reviewed by Sam Weinig.
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntries):
(WebKit::HistoryEntryDataDecoder::operator>>):
(WebKit::HistoryEntryDataDecoder::decodeArithmeticType):
(WebKit::HistoryEntryDataDecoder::bufferIsLargeEnoughToContain):
(WebKit::decodeBackForwardTreeNode):
(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntryData):
(WebKit::HistoryEntryDataDecoder::decode): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (170249 => 170250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-21 19:07:05 UTC (rev 170249)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-21 19:41:31 UTC (rev 170250)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-06-21 Anders Carlsson <andersca@apple.com>
+
+ Begin work on decoding the back/forward tree
+ https://bugs.webkit.org/show_bug.cgi?id=134161
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntries):
+ (WebKit::HistoryEntryDataDecoder::operator>>):
+ (WebKit::HistoryEntryDataDecoder::decodeArithmeticType):
+ (WebKit::HistoryEntryDataDecoder::bufferIsLargeEnoughToContain):
+ (WebKit::decodeBackForwardTreeNode):
+ (WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntryData):
+ (WebKit::HistoryEntryDataDecoder::decode): Deleted.
+
</ins><span class="cx"> 2014-06-21 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Gamepad API - Deprecate the existing implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170249 => 170250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-21 19:07:05 UTC (rev 170249)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-21 19:41:31 UTC (rev 170250)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> entries.append(std::move(entry));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return false;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool LegacySessionStateDecoder::decodeSessionHistoryEntry(CFDictionaryRef entryDictionary, PageState& pageState) const
</span><span class="lines">@@ -209,24 +209,79 @@
</span><span class="cx"> *this >> value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- HistoryEntryDataDecoder& operator>>(uint64_t& value)
</del><ins>+ HistoryEntryDataDecoder& operator>>(bool& value)
</ins><span class="cx"> {
</span><del>- value = 0;
- return decode(value);
</del><ins>+ return decodeArithmeticType(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HistoryEntryDataDecoder& operator>>(uint32_t& value)
</span><span class="cx"> {
</span><del>- value = 0;
- return decode(value);
</del><ins>+ return decodeArithmeticType(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ HistoryEntryDataDecoder& operator>>(int32_t& value)
+ {
+ return *this >> reinterpret_cast<uint32_t&>(value);
+ }
+
+ HistoryEntryDataDecoder& operator>>(uint64_t& value)
+ {
+ return decodeArithmeticType(value);
+ }
+
+ HistoryEntryDataDecoder& operator>>(int64_t& value)
+ {
+ return *this >> reinterpret_cast<uint64_t&>(value);
+ }
+
+ HistoryEntryDataDecoder& operator>>(float& value)
+ {
+ return decodeArithmeticType(value);
+ }
+
+ HistoryEntryDataDecoder& operator>>(String& value)
+ {
+ value = String();
+
+ uint32_t length;
+ *this >> length;
+
+ if (length == std::numeric_limits<uint32_t>::max()) {
+ // This is the null string.
+ value = String();
+ return *this;
+ }
+
+ uint64_t lengthInBytes;
+ *this >> lengthInBytes;
+
+ if (lengthInBytes % sizeof(UChar) || lengthInBytes / sizeof(UChar) != length) {
+ markInvalid();
+ return *this;
+ }
+
+ if (!bufferIsLargeEnoughToContain<UChar>(length)) {
+ markInvalid();
+ return *this;
+ }
+
+ UChar* buffer;
+ auto string = String::createUninitialized(length, buffer);
+ decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length * sizeof(UChar), alignof(UChar));
+
+ value = string;
+ return *this;
+ }
+
</ins><span class="cx"> bool finishDecoding() { return m_buffer == m_bufferEnd; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> template<typename Type>
</span><del>- HistoryEntryDataDecoder& decode(Type& value)
</del><ins>+ HistoryEntryDataDecoder& decodeArithmeticType(Type& value)
</ins><span class="cx"> {
</span><ins>+ static_assert(std::is_arithmetic<Type>::value, "");
+ value = Type();
+
</ins><span class="cx"> decodeFixedLengthData(reinterpret_cast<uint8_t*>(&value), sizeof(value), sizeof(value));
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="lines">@@ -261,6 +316,22 @@
</span><span class="cx"> return reinterpret_cast<uint8_t*>((reinterpret_cast<uintptr_t>(m_buffer) + alignmentMask) & ~alignmentMask);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<typename T>
+ bool bufferIsLargeEnoughToContain(size_t numElements) const
+ {
+ static_assert(std::is_arithmetic<T>::value, "Type T must have a fixed, known encoded size!");
+
+ if (numElements > std::numeric_limits<size_t>::max() / sizeof(T))
+ return false;
+
+ return bufferIsLargeEnoughToContain(alignof(T), numElements * sizeof(T));
+ }
+
+ bool bufferIsLargeEnoughToContain(unsigned alignment, size_t size) const
+ {
+ return alignedBufferIsLargeEnoughToContain(alignedBuffer(alignment), size);
+ }
+
</ins><span class="cx"> inline bool alignedBufferIsLargeEnoughToContain(const uint8_t* alignedPosition, size_t size) const
</span><span class="cx"> {
</span><span class="cx"> return m_bufferEnd >= alignedPosition && static_cast<size_t>(m_bufferEnd - alignedPosition) >= size;
</span><span class="lines">@@ -272,6 +343,66 @@
</span><span class="cx"> const uint8_t* m_bufferEnd;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+static void decodeBackForwardTreeNode(HistoryEntryDataDecoder& decoder, FrameState& frameState)
+{
+ uint64_t childCount;
+ decoder >> childCount;
+
+ for (uint64_t i = 0; i < childCount; ++i) {
+ FrameState childFrameState;
+ decoder >> childFrameState.originalURLString;
+ decoder >> childFrameState.urlString;
+
+ decodeBackForwardTreeNode(decoder, childFrameState);
+ frameState.children.append(std::move(childFrameState));
+ }
+
+ decoder >> frameState.documentSequenceNumber;
+
+ uint64_t documentStateVectorSize;
+ decoder >> documentStateVectorSize;
+
+ for (uint64_t i = 0; i < documentStateVectorSize; ++i) {
+ // FIXME: Implement.
+ ASSERT_NOT_REACHED();
+ }
+
+ String formContentType;
+ decoder >> formContentType;
+
+ bool hasFormData;
+ decoder >> hasFormData;
+
+ if (hasFormData) {
+ // FIXME: Implement.
+ ASSERT_NOT_REACHED();
+ }
+
+ decoder >> frameState.itemSequenceNumber;
+
+ decoder >> frameState.referrer;
+
+ int32_t scrollPointX;
+ decoder >> scrollPointX;
+
+ int32_t scrollPointY;
+ decoder >> scrollPointY;
+
+ frameState.scrollPoint = WebCore::IntPoint(scrollPointX, scrollPointY);
+
+ decoder >> frameState.pageScaleFactor;
+
+ bool hasStateObject;
+ decoder >> hasStateObject;
+
+ if (hasStateObject) {
+ // FIXME: Implement.
+ ASSERT_NOT_REACHED();
+ }
+
+ decoder >> frameState.target;
+}
+
</ins><span class="cx"> bool LegacySessionStateDecoder::decodeSessionHistoryEntryData(CFDataRef historyEntryData, FrameState& mainFrameState) const
</span><span class="cx"> {
</span><span class="cx"> HistoryEntryDataDecoder decoder { CFDataGetBytePtr(historyEntryData), static_cast<size_t>(CFDataGetLength(historyEntryData)) };
</span><span class="lines">@@ -282,7 +413,7 @@
</span><span class="cx"> if (version != sessionHistoryEntryDataVersion)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // FIXME: Implement this.
</del><ins>+ decodeBackForwardTreeNode(decoder, mainFrameState);
</ins><span class="cx">
</span><span class="cx"> return decoder.finishDecoding();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>