<!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>[170727] trunk/Source/WebCore</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/170727">170727</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 15:12:32 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove keyed coding from FormData
https://bugs.webkit.org/show_bug.cgi?id=134565
Reviewed by Tim Horton.
* platform/network/FormData.cpp:
(WebCore::encodeElement): Deleted.
(WebCore::decodeElement): Deleted.
(WebCore::FormData::encode): Deleted.
(WebCore::FormData::decode): Deleted.
* platform/network/FormData.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkFormDatacpp">trunk/Source/WebCore/platform/network/FormData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkFormDatah">trunk/Source/WebCore/platform/network/FormData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170726 => 170727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-02 22:04:49 UTC (rev 170726)
+++ trunk/Source/WebCore/ChangeLog 2014-07-02 22:12:32 UTC (rev 170727)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-07-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove keyed coding from FormData
+ https://bugs.webkit.org/show_bug.cgi?id=134565
+
+ Reviewed by Tim Horton.
+
+ * platform/network/FormData.cpp:
+ (WebCore::encodeElement): Deleted.
+ (WebCore::decodeElement): Deleted.
+ (WebCore::FormData::encode): Deleted.
+ (WebCore::FormData::decode): Deleted.
+ * platform/network/FormData.h:
+
+2014-07-02 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Get rid of the HistoryItem encoding/decoding in WebCore
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134564
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormData.cpp (170726 => 170727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormData.cpp 2014-07-02 22:04:49 UTC (rev 170726)
+++ trunk/Source/WebCore/platform/network/FormData.cpp 2014-07-02 22:12:32 UTC (rev 170727)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include "FormDataBuilder.h"
</span><span class="cx"> #include "FormDataList.h"
</span><del>-#include "KeyedCoding.h"
</del><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="lines">@@ -420,31 +419,6 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void encodeElement(KeyedEncoder& encoder, const FormDataElement& element)
-{
- encoder.encodeEnum("type", element.m_type);
-
- switch (element.m_type) {
- case FormDataElement::Type::Data:
- encoder.encodeBytes("data", reinterpret_cast<const uint8_t*>(element.m_data.data()), element.m_data.size());
- return;
- case FormDataElement::Type::EncodedFile:
- encoder.encodeString("filename", element.m_filename);
- encoder.encodeString("generatedFilename", element.m_generatedFilename);
- encoder.encodeBool("shouldGenerateFile", element.m_shouldGenerateFile);
- encoder.encodeInt64("fileStart", element.m_fileStart);
- encoder.encodeInt64("fileLength", element.m_fileLength);
- encoder.encodeDouble("expectedFileModificationTime", element.m_expectedFileModificationTime);
- return;
-
- case FormDataElement::Type::EncodedBlob:
- encoder.encodeString("url", element.m_url.string());
- return;
- }
-
- ASSERT_NOT_REACHED();
-}
-
</del><span class="cx"> static bool decodeElement(Decoder& decoder, FormDataElement& element)
</span><span class="cx"> {
</span><span class="cx"> uint32_t type;
</span><span class="lines">@@ -508,69 +482,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool decodeElement(KeyedDecoder& decoder, FormDataElement& element)
-{
- if (!decoder.decodeEnum("type", element.m_type, [](FormDataElement::Type type) {
- switch (type) {
- case FormDataElement::Type::Data:
- case FormDataElement::Type::EncodedFile:
- case FormDataElement::Type::EncodedBlob:
- return true;
- }
-
- return false;
- }))
- return false;
-
- switch (element.m_type) {
- case FormDataElement::Type::Data:
- if (!decoder.decodeBytes("data", element.m_data))
- return false;
- break;
-
- case FormDataElement::Type::EncodedFile: {
- if (!decoder.decodeString("filename", element.m_filename))
- return false;
- if (!decoder.decodeString("generatedFilename", element.m_generatedFilename))
- return false;
- if (!decoder.decodeBool("shouldGenerateFile", element.m_shouldGenerateFile))
- return false;
-
- int64_t fileStart;
- if (!decoder.decodeInt64("fileStart", fileStart))
- return false;
- if (fileStart < 0)
- return false;
-
- int64_t fileLength;
- if (!decoder.decodeInt64("fileLength", fileLength))
- return false;
- if (fileLength != BlobDataItem::toEndOfFile && fileLength < fileStart)
- return false;
-
- double expectedFileModificationTime;
- if (!decoder.decodeDouble("expectedFileModificationTime", expectedFileModificationTime))
- return false;
-
- element.m_fileStart = fileStart;
- element.m_fileLength = fileLength;
- element.m_expectedFileModificationTime = expectedFileModificationTime;
- break;
- }
-
- case FormDataElement::Type::EncodedBlob: {
- String blobURLString;
- if (!decoder.decodeString("url", blobURLString))
- return false;
-
- element.m_url = URL(URL(), blobURLString);
- break;
- }
- }
-
- return true;
-}
-
</del><span class="cx"> void FormData::encode(Encoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder.encodeBool(m_alwaysStream);
</span><span class="lines">@@ -587,18 +498,6 @@
</span><span class="cx"> encoder.encodeInt64(m_identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FormData::encode(KeyedEncoder& encoder) const
-{
- encoder.encodeBool("alwaysStream", m_alwaysStream);
- encoder.encodeBytes("boundary", reinterpret_cast<const uint8_t*>(m_boundary.data()), m_boundary.size());
-
- encoder.encodeObjects("elements", m_elements.begin(), m_elements.end(), [](KeyedEncoder& encoder, const FormDataElement& element) {
- encodeElement(encoder, element);
- });
-
- encoder.encodeInt64("identifier", m_identifier);
-}
-
</del><span class="cx"> PassRefPtr<FormData> FormData::decode(Decoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<FormData> data = FormData::create();
</span><span class="lines">@@ -633,25 +532,4 @@
</span><span class="cx"> return data.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<FormData> FormData::decode(KeyedDecoder& decoder)
-{
- RefPtr<FormData> data = FormData::create();
-
- if (!decoder.decodeBool("alwaysStream", data->m_alwaysStream))
- return nullptr;
-
- if (!decoder.decodeBytes("boundary", data->m_boundary))
- return nullptr;
-
- if (!decoder.decodeObjects("elements", data->m_elements, [](KeyedDecoder& decoder, FormDataElement& element) {
- return decodeElement(decoder, element);
- }))
- return nullptr;
-
- if (!decoder.decodeInt64("identifier", data->m_identifier))
- return nullptr;
-
- return data.release();
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormData.h (170726 => 170727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormData.h 2014-07-02 22:04:49 UTC (rev 170726)
+++ trunk/Source/WebCore/platform/network/FormData.h 2014-07-02 22:12:32 UTC (rev 170727)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx">
</span><span class="cx"> class Document;
</span><span class="cx"> class FormDataList;
</span><del>-class KeyedDecoder;
-class KeyedEncoder;
</del><span class="cx"> class TextEncoding;
</span><span class="cx">
</span><span class="cx"> class FormDataElement {
</span><span class="lines">@@ -130,9 +128,7 @@
</span><span class="cx"> PassRefPtr<FormData> deepCopy() const;
</span><span class="cx">
</span><span class="cx"> void encode(Encoder&) const;
</span><del>- void encode(KeyedEncoder&) const;
</del><span class="cx"> static PassRefPtr<FormData> decode(Decoder&);
</span><del>- static PassRefPtr<FormData> decode(KeyedDecoder&);
</del><span class="cx">
</span><span class="cx"> void appendData(const void* data, size_t);
</span><span class="cx"> void appendFile(const String& filePath, bool shouldGenerateFile = false);
</span></span></pre>
</div>
</div>
</body>
</html>