<!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>[170603] 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/170603">170603</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-30 15:14:35 -0700 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement the last pieces of encodeFrameStateNode
https://bugs.webkit.org/show_bug.cgi?id=134460
Reviewed by Andreas Kling.
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::HistoryEntryDataEncoder::operator<<):
(WebKit::isValidEnum):
(WebKit::encodeFormDataElement):
(WebKit::encodeFormData):
(WebKit::encodeFrameStateNode):</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 (170602 => 170603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-30 22:13:37 UTC (rev 170602)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-30 22:14:35 UTC (rev 170603)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-06-30 Anders Carlsson <andersca@apple.com>
+
+ Implement the last pieces of encodeFrameStateNode
+ https://bugs.webkit.org/show_bug.cgi?id=134460
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::HistoryEntryDataEncoder::operator<<):
+ (WebKit::isValidEnum):
+ (WebKit::encodeFormDataElement):
+ (WebKit::encodeFormData):
+ (WebKit::encodeFrameStateNode):
+
</ins><span class="cx"> 2014-06-30 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Move tap highlight to the inverseScaleRootView
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170602 => 170603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-30 22:13:37 UTC (rev 170602)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-30 22:14:35 UTC (rev 170603)
</span><span class="lines">@@ -119,6 +119,22 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ HistoryEntryDataEncoder& operator<<(const Vector<uint8_t>& value)
+ {
+ *this << static_cast<uint64_t>(value.size());
+ encodeFixedLengthData(value.data(), value.size(), 1);
+
+ return *this;
+ }
+
+ HistoryEntryDataEncoder& operator<<(const Vector<char>& value)
+ {
+ *this << static_cast<uint64_t>(value.size());
+ encodeFixedLengthData(reinterpret_cast<const uint8_t*>(value.data()), value.size(), 1);
+
+ return *this;
+ }
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> HistoryEntryDataEncoder& operator<<(WebCore::FloatRect value)
</span><span class="cx"> {
</span><span class="lines">@@ -157,6 +173,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ template<typename T>
+ auto operator<<(T value) -> typename std::enable_if<std::is_enum<T>::value, HistoryEntryDataEncoder&>::type
+ {
+ return *this << static_cast<uint32_t>(value);
+ }
+
</ins><span class="cx"> MallocPtr<uint8_t> finishEncoding(size_t& size)
</span><span class="cx"> {
</span><span class="cx"> size = m_bufferSize;
</span><span class="lines">@@ -212,29 +234,98 @@
</span><span class="cx"> uint8_t* m_bufferPointer;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum class FormDataElementType {
+ Data = 0,
+ EncodedFile = 1,
+ EncodedBlob = 2,
+};
+
+static bool isValidEnum(FormDataElementType type)
+{
+ switch (type) {
+ case FormDataElementType::Data:
+ case FormDataElementType::EncodedFile:
+ case FormDataElementType::EncodedBlob:
+ return true;
+ }
+
+ return false;
+}
+
+static void encodeFormDataElement(HistoryEntryDataEncoder& encoder, const HTTPBody::Element& element)
+{
+ switch (element.type) {
+ case HTTPBody::Element::Type::Data:
+ encoder << FormDataElementType::Data;
+ encoder << element.data;
+ break;
+
+ case HTTPBody::Element::Type::File:
+ encoder << FormDataElementType::EncodedFile;
+ encoder << element.filePath;
+
+ // Used to be generatedFilename.
+ encoder << String();
+
+ // Used to be shouldGenerateFile.
+ encoder << false;
+
+ encoder << element.fileStart;
+ encoder << element.fileLength.valueOr(-1);
+ encoder << element.expectedFileModificationTime.valueOr(std::numeric_limits<double>::quiet_NaN());
+ break;
+
+ case HTTPBody::Element::Type::Blob:
+ encoder << FormDataElementType::EncodedBlob;
+ encoder << element.blobURLString;
+ break;
+ }
+}
+
+static void encodeFormData(HistoryEntryDataEncoder& encoder, const HTTPBody& formData)
+{
+ // Used to be alwaysStream.
+ encoder << false;
+
+ // Used to be boundary.
+ encoder << Vector<uint8_t>();
+
+ encoder << static_cast<uint64_t>(formData.elements.size());
+ for (const auto& element : formData.elements)
+ encodeFormDataElement(encoder, element);
+
+ // Used to be hasGeneratedFiles.
+ encoder << false;
+
+ // Used to be identifier.
+ encoder << static_cast<int64_t>(0);
+}
+
</ins><span class="cx"> static void encodeFrameStateNode(HistoryEntryDataEncoder& encoder, const FrameState& frameState)
</span><span class="cx"> {
</span><span class="cx"> encoder << static_cast<uint64_t>(frameState.children.size());
</span><span class="cx">
</span><span class="cx"> for (const auto& childFrameState : frameState.children) {
</span><del>- // FIXME: Implement.
- (void)childFrameState;
- ASSERT_NOT_REACHED();
</del><ins>+ encoder << childFrameState.originalURLString;
+ encoder << childFrameState.urlString;
+
+ encodeFrameStateNode(encoder, childFrameState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> encoder << frameState.documentSequenceNumber;
</span><span class="cx">
</span><span class="cx"> encoder << static_cast<uint64_t>(frameState.documentState.size());
</span><del>- for (const auto& documentState : frameState.documentState) {
- // FIXME: Implement.
- (void)documentState;
- ASSERT_NOT_REACHED();
- }
</del><ins>+ for (const auto& documentState : frameState.documentState)
+ encoder << documentState;
</ins><span class="cx">
</span><del>- encoder << !!frameState.httpBody;
</del><span class="cx"> if (frameState.httpBody) {
</span><del>- // FIXME: Implement.
- ASSERT_NOT_REACHED();
</del><ins>+ encoder << frameState.httpBody.value().contentType;
+ encoder << true;
+
+ encodeFormData(encoder, frameState.httpBody.value());
+ } else {
+ encoder << String();
+ encoder << false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> encoder << frameState.itemSequenceNumber;
</span><span class="lines">@@ -247,10 +338,8 @@
</span><span class="cx"> encoder << frameState.pageScaleFactor;
</span><span class="cx">
</span><span class="cx"> encoder << !!frameState.stateObjectData;
</span><del>- if (frameState.stateObjectData) {
- // FIXME: Implement.
- ASSERT_NOT_REACHED();
- }
</del><ins>+ if (frameState.stateObjectData)
+ encoder << frameState.stateObjectData.value();
</ins><span class="cx">
</span><span class="cx"> encoder << frameState.target;
</span><span class="cx">
</span><span class="lines">@@ -553,24 +642,6 @@
</span><span class="cx"> const uint8_t* m_bufferEnd;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum class FormDataElementType {
- Data = 0,
- EncodedFile = 1,
- EncodedBlob = 2,
-};
-
-static bool isValidEnum(FormDataElementType type)
-{
- switch (type) {
- case FormDataElementType::Data:
- case FormDataElementType::EncodedFile:
- case FormDataElementType::EncodedBlob:
- return true;
- }
-
- return false;
-}
-
</del><span class="cx"> static void decodeFormDataElement(HistoryEntryDataDecoder& decoder, HTTPBody::Element& formDataElement)
</span><span class="cx"> {
</span><span class="cx"> Optional<FormDataElementType> elementType;
</span></span></pre>
</div>
</div>
</body>
</html>