<!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>[168188] trunk/Source</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/168188">168188</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 14:03:00 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up FormDataElement
https://bugs.webkit.org/show_bug.cgi?id=132483
Reviewed by Sam Weinig.
Source/WebCore:
* platform/network/FormData.cpp:
(WebCore::FormData::FormData):
(WebCore::FormData::deepCopy):
(WebCore::FormData::expandDataStore):
(WebCore::FormData::flatten):
(WebCore::FormData::resolveBlobReferences):
(WebCore::FormData::generateFiles):
(WebCore::FormData::hasGeneratedFiles):
(WebCore::FormData::hasOwnedGeneratedFiles):
(WebCore::FormData::removeGeneratedFilesIfNeeded):
(WebCore::encodeElement):
(WebCore::decodeElement):
* platform/network/FormData.h:
(WebCore::FormDataElement::FormDataElement):
(WebCore::operator==):
* platform/network/cf/FormDataStreamCFNet.cpp:
(WebCore::advanceCurrentStream):
(WebCore::setHTTPBody):
* platform/network/curl/FormDataStreamCurl.cpp:
(WebCore::FormDataStream::read):
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::setupFormData):
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::addFormElementsToSoupMessage):
Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::NetworkResourceLoader):
* Shared/Network/NetworkResourceLoadParameters.cpp:
(WebKit::NetworkResourceLoadParameters::encode):</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>
<li><a href="#trunkSourceWebCoreplatformnetworkcfFormDataStreamCFNetcpp">trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlFormDataStreamCurlcpp">trunk/Source/WebCore/platform/network/curl/FormDataStreamCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkResourceLoadParameterscpp">trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebCore/ChangeLog 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-05-02 Anders Carlsson <andersca@apple.com>
+
+ Clean up FormDataElement
+ https://bugs.webkit.org/show_bug.cgi?id=132483
+
+ Reviewed by Sam Weinig.
+
+ * platform/network/FormData.cpp:
+ (WebCore::FormData::FormData):
+ (WebCore::FormData::deepCopy):
+ (WebCore::FormData::expandDataStore):
+ (WebCore::FormData::flatten):
+ (WebCore::FormData::resolveBlobReferences):
+ (WebCore::FormData::generateFiles):
+ (WebCore::FormData::hasGeneratedFiles):
+ (WebCore::FormData::hasOwnedGeneratedFiles):
+ (WebCore::FormData::removeGeneratedFilesIfNeeded):
+ (WebCore::encodeElement):
+ (WebCore::decodeElement):
+ * platform/network/FormData.h:
+ (WebCore::FormDataElement::FormDataElement):
+ (WebCore::operator==):
+ * platform/network/cf/FormDataStreamCFNet.cpp:
+ (WebCore::advanceCurrentStream):
+ (WebCore::setHTTPBody):
+ * platform/network/curl/FormDataStreamCurl.cpp:
+ (WebCore::FormDataStream::read):
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::setupFormData):
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::addFormElementsToSoupMessage):
+
</ins><span class="cx"> 2014-05-02 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Wireless playback button not blue when active
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormData.cpp (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormData.cpp 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebCore/platform/network/FormData.cpp 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> // We shouldn't be copying FormData that hasn't already removed its generated files
</span><span class="cx"> // but just in case, make sure the new FormData is ready to generate its own files.
</span><span class="cx"> for (FormDataElement& element : m_elements) {
</span><del>- if (element.m_type == FormDataElement::encodedFile) {
</del><ins>+ if (element.m_type == FormDataElement::Type::EncodedFile) {
</ins><span class="cx"> element.m_generatedFilename = String();
</span><span class="cx"> element.m_ownsGeneratedFile = false;
</span><span class="cx"> }
</span><span class="lines">@@ -128,10 +128,10 @@
</span><span class="cx"> formData->m_elements.reserveInitialCapacity(m_elements.size());
</span><span class="cx"> for (const FormDataElement& element : m_elements) {
</span><span class="cx"> switch (element.m_type) {
</span><del>- case FormDataElement::data:
</del><ins>+ case FormDataElement::Type::Data:
</ins><span class="cx"> formData->m_elements.uncheckedAppend(FormDataElement(element.m_data));
</span><span class="cx"> break;
</span><del>- case FormDataElement::encodedFile:
</del><ins>+ case FormDataElement::Type::EncodedFile:
</ins><span class="cx"> #if ENABLE(BLOB)
</span><span class="cx"> formData->m_elements.uncheckedAppend(FormDataElement(element.m_filename, element.m_fileStart, element.m_fileLength, element.m_expectedFileModificationTime, element.m_shouldGenerateFile));
</span><span class="cx"> #else
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> break;
</span><span class="cx"> #if ENABLE(BLOB)
</span><del>- case FormDataElement::encodedBlob:
</del><ins>+ case FormDataElement::Type::EncodedBlob:
</ins><span class="cx"> formData->m_elements.uncheckedAppend(FormDataElement(element.m_url));
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx">
</span><span class="cx"> char* FormData::expandDataStore(size_t size)
</span><span class="cx"> {
</span><del>- if (m_elements.isEmpty() || m_elements.last().m_type != FormDataElement::data)
</del><ins>+ if (m_elements.isEmpty() || m_elements.last().m_type != FormDataElement::Type::Data)
</ins><span class="cx"> m_elements.append(FormDataElement());
</span><span class="cx"> FormDataElement& e = m_elements.last();
</span><span class="cx"> size_t oldSize = e.m_data.size();
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> size_t n = m_elements.size();
</span><span class="cx"> for (size_t i = 0; i < n; ++i) {
</span><span class="cx"> const FormDataElement& e = m_elements[i];
</span><del>- if (e.m_type == FormDataElement::data)
</del><ins>+ if (e.m_type == FormDataElement::Type::Data)
</ins><span class="cx"> data.append(e.m_data.data(), static_cast<size_t>(e.m_data.size()));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> Vector<FormDataElement>::const_iterator it = elements().begin();
</span><span class="cx"> const Vector<FormDataElement>::const_iterator itend = elements().end();
</span><span class="cx"> for (; it != itend; ++it) {
</span><del>- if (it->m_type == FormDataElement::encodedBlob) {
</del><ins>+ if (it->m_type == FormDataElement::Type::EncodedBlob) {
</ins><span class="cx"> hasBlob = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -346,11 +346,11 @@
</span><span class="cx"> it = elements().begin();
</span><span class="cx"> for (; it != itend; ++it) {
</span><span class="cx"> const FormDataElement& element = *it;
</span><del>- if (element.m_type == FormDataElement::data)
</del><ins>+ if (element.m_type == FormDataElement::Type::Data)
</ins><span class="cx"> newFormData->appendData(element.m_data.data(), element.m_data.size());
</span><del>- else if (element.m_type == FormDataElement::encodedFile)
</del><ins>+ else if (element.m_type == FormDataElement::Type::EncodedFile)
</ins><span class="cx"> newFormData->appendFileRange(element.m_filename, element.m_fileStart, element.m_fileLength, element.m_expectedFileModificationTime, element.m_shouldGenerateFile);
</span><del>- else if (element.m_type == FormDataElement::encodedBlob)
</del><ins>+ else if (element.m_type == FormDataElement::Type::EncodedBlob)
</ins><span class="cx"> appendBlobResolved(newFormData.get(), element.m_url);
</span><span class="cx"> else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (FormDataElement& element : m_elements) {
</span><del>- if (element.m_type == FormDataElement::encodedFile && element.m_shouldGenerateFile) {
</del><ins>+ if (element.m_type == FormDataElement::Type::EncodedFile && element.m_shouldGenerateFile) {
</ins><span class="cx"> ASSERT(!element.m_ownsGeneratedFile);
</span><span class="cx"> ASSERT(element.m_generatedFilename.isEmpty());
</span><span class="cx"> if (!element.m_generatedFilename.isEmpty())
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> bool FormData::hasGeneratedFiles() const
</span><span class="cx"> {
</span><span class="cx"> for (const FormDataElement& element : m_elements) {
</span><del>- if (element.m_type == FormDataElement::encodedFile && !element.m_generatedFilename.isEmpty())
</del><ins>+ if (element.m_type == FormDataElement::Type::EncodedFile && !element.m_generatedFilename.isEmpty())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> bool FormData::hasOwnedGeneratedFiles() const
</span><span class="cx"> {
</span><span class="cx"> for (const FormDataElement& element : m_elements) {
</span><del>- if (element.m_type == FormDataElement::encodedFile && element.m_ownsGeneratedFile) {
</del><ins>+ if (element.m_type == FormDataElement::Type::EncodedFile && element.m_ownsGeneratedFile) {
</ins><span class="cx"> ASSERT(!element.m_generatedFilename.isEmpty());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> void FormData::removeGeneratedFilesIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> for (FormDataElement& element : m_elements) {
</span><del>- if (element.m_type == FormDataElement::encodedFile && element.m_ownsGeneratedFile) {
</del><ins>+ if (element.m_type == FormDataElement::Type::EncodedFile && element.m_ownsGeneratedFile) {
</ins><span class="cx"> ASSERT(!element.m_generatedFilename.isEmpty());
</span><span class="cx"> ASSERT(element.m_shouldGenerateFile);
</span><span class="cx"> String directory = directoryName(element.m_generatedFilename);
</span><span class="lines">@@ -415,14 +415,14 @@
</span><span class="cx">
</span><span class="cx"> static void encodeElement(Encoder& encoder, const FormDataElement& element)
</span><span class="cx"> {
</span><del>- encoder.encodeUInt32(element.m_type);
</del><ins>+ encoder.encodeUInt32(static_cast<uint32_t>(element.m_type));
</ins><span class="cx">
</span><span class="cx"> switch (element.m_type) {
</span><del>- case FormDataElement::data:
</del><ins>+ case FormDataElement::Type::Data:
</ins><span class="cx"> encoder.encodeBytes(reinterpret_cast<const uint8_t*>(element.m_data.data()), element.m_data.size());
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- case FormDataElement::encodedFile:
</del><ins>+ case FormDataElement::Type::EncodedFile:
</ins><span class="cx"> encoder.encodeString(element.m_filename);
</span><span class="cx"> encoder.encodeString(element.m_generatedFilename);
</span><span class="cx"> encoder.encodeBool(element.m_shouldGenerateFile);
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><del>- case FormDataElement::encodedBlob:
</del><ins>+ case FormDataElement::Type::EncodedBlob:
</ins><span class="cx"> encoder.encodeString(element.m_url.string());
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="lines">@@ -452,10 +452,10 @@
</span><span class="cx"> encoder.encodeEnum("type", element.m_type);
</span><span class="cx">
</span><span class="cx"> switch (element.m_type) {
</span><del>- case FormDataElement::data:
</del><ins>+ case FormDataElement::Type::Data:
</ins><span class="cx"> encoder.encodeBytes("data", reinterpret_cast<const uint8_t*>(element.m_data.data()), element.m_data.size());
</span><span class="cx"> return;
</span><del>- case FormDataElement::encodedFile:
</del><ins>+ case FormDataElement::Type::EncodedFile:
</ins><span class="cx"> encoder.encodeString("filename", element.m_filename);
</span><span class="cx"> encoder.encodeString("generatedFilename", element.m_generatedFilename);
</span><span class="cx"> encoder.encodeBool("shouldGenerateFile", element.m_shouldGenerateFile);
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><del>- case FormDataElement::encodedBlob:
</del><ins>+ case FormDataElement::Type::EncodedBlob:
</ins><span class="cx"> encoder.encodeString("url", element.m_url.string());
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="lines">@@ -482,9 +482,9 @@
</span><span class="cx"> if (!decoder.decodeUInt32(type))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- switch (type) {
- case FormDataElement::data: {
- element.m_type = FormDataElement::data;
</del><ins>+ switch (static_cast<FormDataElement::Type>(type)) {
+ case FormDataElement::Type::Data: {
+ element.m_type = FormDataElement::Type::Data;
</ins><span class="cx"> Vector<uint8_t> data;
</span><span class="cx"> if (!decoder.decodeBytes(data))
</span><span class="cx"> return false;
</span><span class="lines">@@ -494,13 +494,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case FormDataElement::encodedFile:
- {
</del><ins>+ case FormDataElement::Type::EncodedFile: {
</ins><span class="cx"> element.m_type = static_cast<FormDataElement::Type>(type);
</span><span class="cx"> String filenameOrURL;
</span><span class="cx"> if (!decoder.decodeString(filenameOrURL))
</span><span class="cx"> return false;
</span><del>- if (type == FormDataElement::encodedFile) {
</del><ins>+ if (static_cast<FormDataElement::Type>(type) == FormDataElement::Type::EncodedFile) {
</ins><span class="cx"> if (!decoder.decodeString(element.m_generatedFilename))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decodeBool(element.m_shouldGenerateFile))
</span><span class="lines">@@ -530,8 +529,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><del>- case FormDataElement::encodedBlob:
- element.m_type = FormDataElement::encodedBlob;
</del><ins>+ case FormDataElement::Type::EncodedBlob:
+ element.m_type = FormDataElement::Type::EncodedBlob;
</ins><span class="cx"> String blobURLString;
</span><span class="cx"> if (!decoder.decodeString(blobURLString))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormData.h (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormData.h 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebCore/platform/network/FormData.h 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -35,23 +35,53 @@
</span><span class="cx">
</span><span class="cx"> class FormDataElement {
</span><span class="cx"> public:
</span><del>- FormDataElement() : m_type(data) { }
- explicit FormDataElement(const Vector<char>& array) : m_type(data), m_data(array) { }
</del><ins>+ enum class Type {
+ Data,
+ EncodedFile,
+#if ENABLE(BLOB)
+ EncodedBlob,
+#endif
+ };
</ins><span class="cx">
</span><ins>+ FormDataElement()
+ : m_type(Type::Data)
+ {
+ }
+
+ explicit FormDataElement(const Vector<char>& array)
+ : m_type(Type::Data)
+ , m_data(array)
+ {
+ }
+
</ins><span class="cx"> #if ENABLE(BLOB)
</span><del>- FormDataElement(const String& filename, long long fileStart, long long fileLength, double expectedFileModificationTime, bool shouldGenerateFile) : m_type(encodedFile), m_filename(filename), m_fileStart(fileStart), m_fileLength(fileLength), m_expectedFileModificationTime(expectedFileModificationTime), m_shouldGenerateFile(shouldGenerateFile), m_ownsGeneratedFile(false) { }
- explicit FormDataElement(const URL& blobURL) : m_type(encodedBlob), m_url(blobURL) { }
</del><ins>+ FormDataElement(const String& filename, long long fileStart, long long fileLength, double expectedFileModificationTime, bool shouldGenerateFile)
+ : m_type(Type::EncodedFile)
+ , m_filename(filename)
+ , m_fileStart(fileStart)
+ , m_fileLength(fileLength)
+ , m_expectedFileModificationTime(expectedFileModificationTime)
+ , m_shouldGenerateFile(shouldGenerateFile)
+ , m_ownsGeneratedFile(false)
+ {
+ }
+
+ explicit FormDataElement(const URL& blobURL)
+ : m_type(Type::EncodedBlob)
+ , m_url(blobURL)
+ {
+ }
</ins><span class="cx"> #else
</span><del>- FormDataElement(const String& filename, bool shouldGenerateFile) : m_type(encodedFile), m_filename(filename), m_shouldGenerateFile(shouldGenerateFile), m_ownsGeneratedFile(false) { }
</del><ins>+ FormDataElement(const String& filename, bool shouldGenerateFile)
+ : m_type(Type::EncodedFile)
+ , m_filename(filename)
+ , m_shouldGenerateFile(shouldGenerateFile)
+ , m_ownsGeneratedFile(false)
+ {
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- enum Type {
- data,
- encodedFile
-#if ENABLE(BLOB)
- , encodedBlob
-#endif
- } m_type;
</del><ins>+ Type m_type;
</ins><span class="cx"> Vector<char> m_data;
</span><span class="cx"> String m_filename;
</span><span class="cx"> #if ENABLE(BLOB)
</span><span class="lines">@@ -72,12 +102,12 @@
</span><span class="cx">
</span><span class="cx"> if (a.m_type != b.m_type)
</span><span class="cx"> return false;
</span><del>- if (a.m_type == FormDataElement::data)
</del><ins>+ if (a.m_type == FormDataElement::Type::Data)
</ins><span class="cx"> return a.m_data == b.m_data;
</span><del>- if (a.m_type == FormDataElement::encodedFile)
</del><ins>+ if (a.m_type == FormDataElement::Type::EncodedFile)
</ins><span class="cx"> #if ENABLE(BLOB)
</span><span class="cx"> return a.m_filename == b.m_filename && a.m_fileStart == b.m_fileStart && a.m_fileLength == b.m_fileLength && a.m_expectedFileModificationTime == b.m_expectedFileModificationTime;
</span><del>- if (a.m_type == FormDataElement::encodedBlob)
</del><ins>+ if (a.m_type == FormDataElement::Type::EncodedBlob)
</ins><span class="cx"> return a.m_url == b.m_url;
</span><span class="cx"> #else
</span><span class="cx"> return a.m_filename == b.m_filename;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfFormDataStreamCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> // Create the new stream.
</span><span class="cx"> FormDataElement& nextInput = form->remainingElements.last();
</span><span class="cx">
</span><del>- if (nextInput.m_type == FormDataElement::data) {
</del><ins>+ if (nextInput.m_type == FormDataElement::Type::Data) {
</ins><span class="cx"> size_t size = nextInput.m_data.size();
</span><span class="cx"> MallocPtr<char> data = nextInput.m_data.releaseBuffer();
</span><span class="cx"> form->currentStream = CFReadStreamCreateWithBytesNoCopy(0, reinterpret_cast<const UInt8*>(data.get()), size, kCFAllocatorNull);
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> // Handle the common special case of one piece of form data, with no files.
</span><span class="cx"> if (count == 1 && !formData->alwaysStream()) {
</span><span class="cx"> const FormDataElement& element = formData->elements()[0];
</span><del>- if (element.m_type == FormDataElement::data) {
</del><ins>+ if (element.m_type == FormDataElement::Type::Data) {
</ins><span class="cx"> RetainPtr<CFDataRef> data = adoptCF(CFDataCreate(0, reinterpret_cast<const UInt8 *>(element.m_data.data()), element.m_data.size()));
</span><span class="cx"> CFURLRequestSetHTTPRequestBody(request, data.get());
</span><span class="cx"> return;
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> unsigned long long length = 0;
</span><span class="cx"> for (size_t i = 0; i < count; ++i) {
</span><span class="cx"> const FormDataElement& element = formData->elements()[i];
</span><del>- if (element.m_type == FormDataElement::data)
</del><ins>+ if (element.m_type == FormDataElement::Type::Data)
</ins><span class="cx"> length += element.m_data.size();
</span><span class="cx"> else {
</span><span class="cx"> #if ENABLE(BLOB)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlFormDataStreamCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/FormDataStreamCurl.cpp (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/FormDataStreamCurl.cpp 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebCore/platform/network/curl/FormDataStreamCurl.cpp 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> size_t toSend = blockSize * numberOfBlocks;
</span><span class="cx"> size_t sent;
</span><span class="cx">
</span><del>- if (element.m_type == FormDataElement::encodedFile) {
</del><ins>+ if (element.m_type == FormDataElement::Type::EncodedFile) {
</ins><span class="cx"> if (!m_file)
</span><span class="cx"> m_file = fopen(element.m_filename.utf8().data(), "rb");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -782,7 +782,7 @@
</span><span class="cx"> bool chunkedTransfer = false;
</span><span class="cx"> for (size_t i = 0; i < numElements; i++) {
</span><span class="cx"> FormDataElement element = elements[i];
</span><del>- if (element.m_type == FormDataElement::encodedFile) {
</del><ins>+ if (element.m_type == FormDataElement::Type::EncodedFile) {
</ins><span class="cx"> long long fileSizeResult;
</span><span class="cx"> if (getFileSize(element.m_filename, fileSizeResult)) {
</span><span class="cx"> if (fileSizeResult > maxCurlOffT) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -814,14 +814,14 @@
</span><span class="cx"> for (size_t i = 0; i < numElements; i++) {
</span><span class="cx"> const FormDataElement& element = httpBody->elements()[i];
</span><span class="cx">
</span><del>- if (element.m_type == FormDataElement::data) {
</del><ins>+ if (element.m_type == FormDataElement::Type::Data) {
</ins><span class="cx"> totalBodySize += element.m_data.size();
</span><span class="cx"> soup_message_body_append(message->request_body, SOUP_MEMORY_TEMPORARY,
</span><span class="cx"> element.m_data.data(), element.m_data.size());
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (element.m_type == FormDataElement::encodedFile) {
</del><ins>+ if (element.m_type == FormDataElement::Type::EncodedFile) {
</ins><span class="cx"> if (!addFileToSoupMessageBody(message ,
</span><span class="cx"> element.m_filename,
</span><span class="cx"> 0 /* offset */,
</span><span class="lines">@@ -832,7 +832,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><del>- ASSERT(element.m_type == FormDataElement::encodedBlob);
</del><ins>+ ASSERT(element.m_type == FormDataElement::Type::EncodedBlob);
</ins><span class="cx"> addEncodedBlobToSoupMessageBody(message, element, totalBodySize);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-05-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Clean up FormDataElement
+ https://bugs.webkit.org/show_bug.cgi?id=132483
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::NetworkResourceLoader):
+ * Shared/Network/NetworkResourceLoadParameters.cpp:
+ (WebKit::NetworkResourceLoadParameters::encode):
+
+2014-05-02 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add and implement KeyedDecoder::decodeBytes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132479
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> if (m_request.httpBody()) {
</span><span class="cx"> const Vector<FormDataElement>& elements = m_request.httpBody()->elements();
</span><span class="cx"> for (size_t i = 0, count = elements.size(); i < count; ++i) {
</span><del>- if (elements[i].m_type == FormDataElement::encodedBlob) {
</del><ins>+ if (elements[i].m_type == FormDataElement::Type::EncodedBlob) {
</ins><span class="cx"> Vector<RefPtr<SandboxExtension>> blobElementExtensions = NetworkBlobRegistry::shared().sandboxExtensions(elements[i].m_url);
</span><span class="cx"> m_requestBodySandboxExtensions.appendVector(blobElementExtensions);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkResourceLoadParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp (168187 => 168188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp 2014-05-02 20:53:11 UTC (rev 168187)
+++ trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp 2014-05-02 21:03:00 UTC (rev 168188)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> const Vector<FormDataElement>& elements = request.httpBody()->elements();
</span><span class="cx"> size_t fileCount = 0;
</span><span class="cx"> for (size_t i = 0, count = elements.size(); i < count; ++i) {
</span><del>- if (elements[i].m_type == FormDataElement::encodedFile)
</del><ins>+ if (elements[i].m_type == FormDataElement::Type::EncodedFile)
</ins><span class="cx"> ++fileCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> size_t extensionIndex = 0;
</span><span class="cx"> for (size_t i = 0, count = elements.size(); i < count; ++i) {
</span><span class="cx"> const FormDataElement& element = elements[i];
</span><del>- if (element.m_type == FormDataElement::encodedFile) {
</del><ins>+ if (element.m_type == FormDataElement::Type::EncodedFile) {
</ins><span class="cx"> const String& path = element.m_shouldGenerateFile ? element.m_generatedFilename : element.m_filename;
</span><span class="cx"> SandboxExtension::createHandle(path, SandboxExtension::ReadOnly, requestBodySandboxExtensions[extensionIndex++]);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>