<!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>[170252] 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/170252">170252</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-21 14:01:26 -0700 (Sat, 21 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Begin work on decoding form data
https://bugs.webkit.org/show_bug.cgi?id=134163
Reviewed by Sam Weinig.
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::HistoryEntryDataDecoder::operator>>):
(WebKit::HistoryEntryDataDecoder::isValid):
(WebKit::isValidEnum):
(WebKit::decodeFormDataElement):
(WebKit::decodeFormData):
(WebKit::decodeBackForwardTreeNode):</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 (170251 => 170252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-21 20:05:38 UTC (rev 170251)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-21 21:01:26 UTC (rev 170252)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-06-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Begin work on decoding form data
+ https://bugs.webkit.org/show_bug.cgi?id=134163
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::HistoryEntryDataDecoder::operator>>):
+ (WebKit::HistoryEntryDataDecoder::isValid):
+ (WebKit::isValidEnum):
+ (WebKit::decodeFormDataElement):
+ (WebKit::decodeFormData):
+ (WebKit::decodeBackForwardTreeNode):
+
+2014-06-21 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Only initialize WebPreferences from NSUserDefaults if there's an identifier
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134162
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170251 => 170252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-21 20:05:38 UTC (rev 170251)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-21 21:01:26 UTC (rev 170252)
</span><span class="lines">@@ -198,6 +198,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T> void isValidEnum(T);
+
</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 class="lines">@@ -273,6 +275,56 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ HistoryEntryDataDecoder& operator>>(Vector<uint8_t>& value)
+ {
+ value = { };
+
+ uint64_t size;
+ *this >> size;
+
+ if (!alignBufferPosition(1, size))
+ return *this;
+
+ const uint8_t* data = m_buffer;
+ m_buffer += size;
+
+ value.append(data, size);
+ return *this;
+ }
+
+ HistoryEntryDataDecoder& operator>>(Vector<char>& value)
+ {
+ value = { };
+
+ uint64_t size;
+ *this >> size;
+
+ if (!alignBufferPosition(1, size))
+ return *this;
+
+ const uint8_t* data = m_buffer;
+ m_buffer += size;
+
+ value.append(data, size);
+ return *this;
+ }
+
+ template<typename T>
+ auto operator>>(Optional<T>& value) -> typename std::enable_if<std::is_enum<T>::value, HistoryEntryDataDecoder&>::type
+ {
+ uint32_t underlyingEnumValue;
+ *this >> underlyingEnumValue;
+
+ if (!isValid() || !isValidEnum(static_cast<T>(underlyingEnumValue)))
+ value = Nullopt;
+ else
+ value = static_cast<T>(underlyingEnumValue);
+
+ return *this;
+ }
+
+ bool isValid() const { return m_buffer <= m_bufferEnd; }
+
</ins><span class="cx"> bool finishDecoding() { return m_buffer == m_bufferEnd; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -343,6 +395,63 @@
</span><span class="cx"> const uint8_t* m_bufferEnd;
</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 decodeFormDataElement(HistoryEntryDataDecoder& decoder, HTTPBody::Element& formDataElement)
+{
+ Optional<FormDataElementType> elementType;
+ decoder >> elementType;
+ if (!elementType)
+ return;
+
+ switch (elementType.value()) {
+ case FormDataElementType::Data:
+ formDataElement.type = HTTPBody::Element::Type::Data;
+ decoder >> formDataElement.data;
+ break;
+
+ case FormDataElementType::EncodedFile:
+ case FormDataElementType::EncodedBlob:
+ // FIXME: Implement.
+ ASSERT_NOT_REACHED();
+ }
+}
+
+static void decodeFormData(HistoryEntryDataDecoder& decoder, HTTPBody& formData)
+{
+ bool alwaysStream;
+ decoder >> alwaysStream;
+
+ Vector<uint8_t> boundary;
+ decoder >> boundary;
+
+ uint64_t formDataElementCount;
+ decoder >> formDataElementCount;
+
+ for (uint64_t i = 0; i < formDataElementCount; ++i) {
+ HTTPBody::Element formDataElement;
+ decodeFormDataElement(decoder, formDataElement);
+
+ formData.elements.append(std::move(formDataElement));
+ }
+}
+
</ins><span class="cx"> static void decodeBackForwardTreeNode(HistoryEntryDataDecoder& decoder, FrameState& frameState)
</span><span class="cx"> {
</span><span class="cx"> uint64_t childCount;
</span><span class="lines">@@ -374,8 +483,12 @@
</span><span class="cx"> decoder >> hasFormData;
</span><span class="cx">
</span><span class="cx"> if (hasFormData) {
</span><del>- // FIXME: Implement.
- ASSERT_NOT_REACHED();
</del><ins>+ HTTPBody httpBody;
+ httpBody.contentType = std::move(formContentType);
+
+ decodeFormData(decoder, httpBody);
+
+ frameState.httpBody = std::move(httpBody);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> decoder >> frameState.itemSequenceNumber;
</span></span></pre>
</div>
</div>
</body>
</html>