<!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>[206421] 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/206421">206421</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-27 00:58:48 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] Refactor FetchBody to use std::experimental::variant
https://bugs.webkit.org/show_bug.cgi?id=162559
Patch by Youenn Fablet <youenn@apple.com> on 2016-09-27
Reviewed by Alex Christensen.
Covered by exiting tests.
Using variant to represent the variant data types.
Adding nullptr as a specific type for default empty values and to allow clean-up.
Adding FetchBody::clone as the default copy constructor is deleted with this change.
* Modules/fetch/FetchBody.cpp:
(WebCore::FetchBody::FetchBody):
(WebCore::FetchBody::json):
(WebCore::FetchBody::text):
(WebCore::FetchBody::consumeAsStream):
(WebCore::FetchBody::consumeArrayBuffer):
(WebCore::FetchBody::consumeArrayBufferView):
(WebCore::FetchBody::consumeText):
(WebCore::FetchBody::consumeBlob):
(WebCore::FetchBody::extractFromText):
(WebCore::FetchBody::bodyForInternalRequest):
(WebCore::FetchBody::clone):
* Modules/fetch/FetchBody.h:
(WebCore::FetchBody::blobBody):
(WebCore::FetchBody::formDataBody):
(WebCore::FetchBody::arrayBufferBody):
(WebCore::FetchBody::arrayBufferViewBody):
(WebCore::FetchBody::textBody):
* Modules/fetch/FetchRequest.cpp:
(WebCore::FetchRequest::clone):
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::cloneForJS):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodycpp">trunk/Source/WebCore/Modules/fetch/FetchBody.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyh">trunk/Source/WebCore/Modules/fetch/FetchBody.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequestcpp">trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206420 => 206421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-27 07:52:29 UTC (rev 206420)
+++ trunk/Source/WebCore/ChangeLog 2016-09-27 07:58:48 UTC (rev 206421)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-09-27 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] Refactor FetchBody to use std::experimental::variant
+ https://bugs.webkit.org/show_bug.cgi?id=162559
+
+ Reviewed by Alex Christensen.
+
+ Covered by exiting tests.
+
+ Using variant to represent the variant data types.
+ Adding nullptr as a specific type for default empty values and to allow clean-up.
+ Adding FetchBody::clone as the default copy constructor is deleted with this change.
+
+ * Modules/fetch/FetchBody.cpp:
+ (WebCore::FetchBody::FetchBody):
+ (WebCore::FetchBody::json):
+ (WebCore::FetchBody::text):
+ (WebCore::FetchBody::consumeAsStream):
+ (WebCore::FetchBody::consumeArrayBuffer):
+ (WebCore::FetchBody::consumeArrayBufferView):
+ (WebCore::FetchBody::consumeText):
+ (WebCore::FetchBody::consumeBlob):
+ (WebCore::FetchBody::extractFromText):
+ (WebCore::FetchBody::bodyForInternalRequest):
+ (WebCore::FetchBody::clone):
+ * Modules/fetch/FetchBody.h:
+ (WebCore::FetchBody::blobBody):
+ (WebCore::FetchBody::formDataBody):
+ (WebCore::FetchBody::arrayBufferBody):
+ (WebCore::FetchBody::arrayBufferViewBody):
+ (WebCore::FetchBody::textBody):
+ * Modules/fetch/FetchRequest.cpp:
+ (WebCore::FetchRequest::clone):
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::cloneForJS):
+
</ins><span class="cx"> 2016-09-26 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Fix debug build break since r204205. Unreviewed
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (206420 => 206421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-09-27 07:52:29 UTC (rev 206420)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-09-27 07:58:48 UTC (rev 206421)
</span><span class="lines">@@ -48,23 +48,22 @@
</span><span class="cx">
</span><span class="cx"> FetchBody::FetchBody(Ref<Blob>&& blob)
</span><span class="cx"> : m_type(Type::Blob)
</span><del>- , m_contentType(blob->type())
- , m_blob(WTFMove(blob))
</del><ins>+ , m_data(WTFMove(blob))
+ , m_contentType(this->blobBody().type())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FetchBody::FetchBody(DOMFormData& formData, Document& document)
</span><span class="cx"> : m_type(Type::FormData)
</span><del>- , m_contentType(ASCIILiteral("multipart/form-data"))
</del><ins>+ , m_data(FormData::createMultiPart(formData, formData.encoding(), &document))
+ , m_contentType(makeString("multipart/form-data;boundary=", this->formDataBody().boundary().data()))
</ins><span class="cx"> {
</span><del>- m_formData = FormData::createMultiPart(formData, formData.encoding(), &document);
- m_contentType = makeString("multipart/form-data;boundary=", m_formData->boundary().data());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FetchBody::FetchBody(String&& text)
</span><span class="cx"> : m_type(Type::Text)
</span><ins>+ , m_data(WTFMove(text))
</ins><span class="cx"> , m_contentType(ASCIILiteral("text/plain;charset=UTF-8"))
</span><del>- , m_text(WTFMove(text))
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -76,10 +75,17 @@
</span><span class="cx">
</span><span class="cx"> FetchBody::FetchBody(Ref<ArrayBufferView>&& dataView)
</span><span class="cx"> : m_type(Type::ArrayBufferView)
</span><del>- , m_dataView(WTFMove(dataView))
</del><ins>+ , m_data(WTFMove(dataView))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FetchBody::FetchBody(Type type, const String& contentType, const FetchBodyConsumer& consumer)
+ : m_type(type)
+ , m_contentType(contentType)
+ , m_consumer(consumer)
+{
+}
+
</ins><span class="cx"> FetchBody FetchBody::extract(ScriptExecutionContext& context, JSC::ExecState& state, JSC::JSValue value)
</span><span class="cx"> {
</span><span class="cx"> if (value.inherits(JSBlob::info()))
</span><span class="lines">@@ -144,7 +150,7 @@
</span><span class="cx"> ASSERT(m_type != Type::None);
</span><span class="cx">
</span><span class="cx"> if (m_type == Type::Text) {
</span><del>- fulfillPromiseWithJSON(WTFMove(promise), m_text);
</del><ins>+ fulfillPromiseWithJSON(WTFMove(promise), textBody());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_consumer.setType(FetchBodyConsumer::Type::JSON);
</span><span class="lines">@@ -156,7 +162,7 @@
</span><span class="cx"> ASSERT(m_type != Type::None);
</span><span class="cx">
</span><span class="cx"> if (m_type == Type::Text) {
</span><del>- promise->resolve(m_text);
</del><ins>+ promise->resolve(textBody());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_consumer.setType(FetchBodyConsumer::Type::Text);
</span><span class="lines">@@ -209,26 +215,23 @@
</span><span class="cx"> bool closeStream = false;
</span><span class="cx"> switch (m_type) {
</span><span class="cx"> case Type::ArrayBuffer:
</span><del>- ASSERT(m_data);
- closeStream = source.enqueue(ArrayBuffer::tryCreate(m_data->data(), m_data->byteLength()));
</del><ins>+ closeStream = source.enqueue(ArrayBuffer::tryCreate(arrayBufferBody().data(), arrayBufferBody().byteLength()));
</ins><span class="cx"> m_data = nullptr;
</span><span class="cx"> break;
</span><span class="cx"> case Type::ArrayBufferView: {
</span><del>- ASSERT(m_dataView);
- closeStream = source.enqueue(ArrayBuffer::tryCreate(m_dataView->baseAddress(), m_dataView->byteLength()));
- m_dataView = nullptr;
</del><ins>+ closeStream = source.enqueue(ArrayBuffer::tryCreate(arrayBufferViewBody().baseAddress(), arrayBufferViewBody().byteLength()));
+ m_data = nullptr;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case Type::Text: {
</span><span class="cx"> Vector<uint8_t> data = extractFromText();
</span><span class="cx"> closeStream = source.enqueue(ArrayBuffer::tryCreate(data.data(), data.size()));
</span><del>- m_text = { };
</del><ins>+ m_data = nullptr;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case Type::Blob:
</span><del>- ASSERT(m_blob);
- owner.loadBlob(*m_blob, nullptr);
- m_blob = nullptr;
</del><ins>+ owner.loadBlob(blobBody(), nullptr);
+ m_data = nullptr;
</ins><span class="cx"> break;
</span><span class="cx"> case Type::None:
</span><span class="cx"> closeStream = true;
</span><span class="lines">@@ -248,16 +251,14 @@
</span><span class="cx">
</span><span class="cx"> void FetchBody::consumeArrayBuffer(Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><del>- ASSERT(m_data);
- m_consumer.resolveWithData(WTFMove(promise), static_cast<const uint8_t*>(m_data->data()), m_data->byteLength());
</del><ins>+ m_consumer.resolveWithData(WTFMove(promise), static_cast<const uint8_t*>(arrayBufferBody().data()), arrayBufferBody().byteLength());
</ins><span class="cx"> m_data = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBody::consumeArrayBufferView(Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><del>- ASSERT(m_dataView);
- m_consumer.resolveWithData(WTFMove(promise), static_cast<const uint8_t*>(m_dataView->baseAddress()), m_dataView->byteLength());
- m_dataView = nullptr;
</del><ins>+ m_consumer.resolveWithData(WTFMove(promise), static_cast<const uint8_t*>(arrayBufferViewBody().baseAddress()), arrayBufferViewBody().byteLength());
+ m_data = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBody::consumeText(Ref<DeferredPromise>&& promise)
</span><span class="lines">@@ -264,16 +265,14 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<uint8_t> data = extractFromText();
</span><span class="cx"> m_consumer.resolveWithData(WTFMove(promise), data.data(), data.size());
</span><del>- m_text = { };
</del><ins>+ m_data = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBody::consumeBlob(FetchBodyOwner& owner, Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><del>- ASSERT(m_blob);
-
</del><span class="cx"> m_consumePromise = WTFMove(promise);
</span><del>- owner.loadBlob(*m_blob, &m_consumer);
- m_blob = nullptr;
</del><ins>+ owner.loadBlob(blobBody(), &m_consumer);
+ m_data = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<uint8_t> FetchBody::extractFromText() const
</span><span class="lines">@@ -280,7 +279,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_type == Type::Text);
</span><span class="cx"> // FIXME: This double allocation is not efficient. Might want to fix that at WTFString level.
</span><del>- CString data = m_text.utf8();
</del><ins>+ CString data = textBody().utf8();
</ins><span class="cx"> Vector<uint8_t> value(data.length());
</span><span class="cx"> memcpy(value.data(), data.data(), data.length());
</span><span class="cx"> return value;
</span><span class="lines">@@ -307,23 +306,19 @@
</span><span class="cx"> case Type::None:
</span><span class="cx"> return nullptr;
</span><span class="cx"> case Type::Text:
</span><del>- return FormData::create(UTF8Encoding().encode(m_text, EntitiesForUnencodables));
</del><ins>+ return FormData::create(UTF8Encoding().encode(textBody(), EntitiesForUnencodables));
</ins><span class="cx"> case Type::Blob: {
</span><del>- ASSERT(m_blob);
</del><span class="cx"> RefPtr<FormData> body = FormData::create();
</span><del>- body->appendBlob(m_blob->url());
</del><ins>+ body->appendBlob(blobBody().url());
</ins><span class="cx"> return body;
</span><span class="cx"> }
</span><span class="cx"> case Type::ArrayBuffer:
</span><del>- ASSERT(m_data);
- return FormData::create(m_data->data(), m_data->byteLength());
</del><ins>+ return FormData::create(arrayBufferBody().data(), arrayBufferBody().byteLength());
</ins><span class="cx"> case Type::ArrayBufferView:
</span><del>- ASSERT(m_dataView);
- return FormData::create(m_dataView->baseAddress(), m_dataView->byteLength());
</del><ins>+ return FormData::create(arrayBufferViewBody().baseAddress(), arrayBufferViewBody().byteLength());
</ins><span class="cx"> case Type::FormData: {
</span><del>- ASSERT(m_formData);
</del><span class="cx"> ASSERT(!context.isWorkerGlobalScope());
</span><del>- auto body = m_formData;
</del><ins>+ RefPtr<FormData> body = const_cast<FormData*>(&formDataBody());
</ins><span class="cx"> body->generateFiles(static_cast<Document*>(&context));
</span><span class="cx"> return body;
</span><span class="cx"> }
</span><span class="lines">@@ -333,6 +328,36 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FetchBody FetchBody::clone() const
+{
+ ASSERT(!m_consumePromise);
+ FetchBody clone(m_type, m_contentType, m_consumer);
+
+ switch (m_type) {
+ case Type::ArrayBuffer:
+ clone.m_data = const_cast<ArrayBuffer&>(arrayBufferBody());
+ break;
+ case Type::ArrayBufferView:
+ clone.m_data = const_cast<ArrayBufferView&>(arrayBufferViewBody());
+ break;
+ case Type::Blob:
+ clone.m_data = const_cast<Blob&>(blobBody());
+ break;
+ case Type::FormData:
+ clone.m_data = const_cast<FormData&>(formDataBody());
+ break;
+ case Type::Text:
+ clone.m_data = textBody();
+ break;
+ case Type::Loaded:
+ case Type::None:
+ case Type::Loading:
+ case Type::ReadableStream:
+ break;
+ }
+ return clone;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif // ENABLE(FETCH_API)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (206420 => 206421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-09-27 07:52:29 UTC (rev 206420)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-09-27 07:58:48 UTC (rev 206421)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "FetchLoader.h"
</span><span class="cx"> #include "FormData.h"
</span><span class="cx"> #include "JSDOMPromise.h"
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class ExecState;
</span><span class="lines">@@ -85,6 +86,8 @@
</span><span class="cx">
</span><span class="cx"> void cleanConsumePromise() { m_consumePromise = nullptr; }
</span><span class="cx">
</span><ins>+ FetchBody clone() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> FetchBody(Ref<Blob>&&);
</span><span class="cx"> FetchBody(Ref<ArrayBuffer>&&);
</span><span class="lines">@@ -91,6 +94,7 @@
</span><span class="cx"> FetchBody(Ref<ArrayBufferView>&&);
</span><span class="cx"> FetchBody(DOMFormData&, Document&);
</span><span class="cx"> FetchBody(String&&);
</span><ins>+ FetchBody(Type, const String&, const FetchBodyConsumer&);
</ins><span class="cx"> FetchBody(Type type) : m_type(type) { }
</span><span class="cx">
</span><span class="cx"> void consume(FetchBodyOwner&, Ref<DeferredPromise>&&);
</span><span class="lines">@@ -101,15 +105,22 @@
</span><span class="cx"> void consumeText(Ref<DeferredPromise>&&);
</span><span class="cx"> void consumeBlob(FetchBodyOwner&, Ref<DeferredPromise>&&);
</span><span class="cx">
</span><ins>+ Blob& blobBody() { return std::experimental::get<Ref<Blob>>(m_data).get(); }
+ const Blob& blobBody() const { return std::experimental::get<Ref<Blob>>(m_data).get(); }
+ FormData& formDataBody() { return std::experimental::get<Ref<FormData>>(m_data).get(); }
+ const FormData& formDataBody() const { return std::experimental::get<Ref<FormData>>(m_data).get(); }
+ ArrayBuffer& arrayBufferBody() { return std::experimental::get<Ref<ArrayBuffer>>(m_data).get(); }
+ const ArrayBuffer& arrayBufferBody() const { return std::experimental::get<Ref<ArrayBuffer>>(m_data).get(); }
+ ArrayBufferView& arrayBufferViewBody() { return std::experimental::get<Ref<ArrayBufferView>>(m_data).get(); }
+ const ArrayBufferView& arrayBufferViewBody() const { return std::experimental::get<Ref<ArrayBufferView>>(m_data).get(); }
+ String& textBody() { return std::experimental::get<String>(m_data); }
+ const String& textBody() const { return std::experimental::get<String>(m_data); }
+
</ins><span class="cx"> Type m_type { Type::None };
</span><del>- String m_contentType;
</del><span class="cx">
</span><span class="cx"> // FIXME: Add support for URLSearchParams.
</span><del>- RefPtr<Blob> m_blob;
- RefPtr<FormData> m_formData;
- RefPtr<ArrayBuffer> m_data;
- RefPtr<ArrayBufferView> m_dataView;
- String m_text;
</del><ins>+ std::experimental::variant<std::nullptr_t, Ref<Blob>, Ref<FormData>, Ref<ArrayBuffer>, Ref<ArrayBufferView>, String> m_data;
+ String m_contentType;
</ins><span class="cx">
</span><span class="cx"> FetchBodyConsumer m_consumer { FetchBodyConsumer::Type::None };
</span><span class="cx"> RefPtr<DeferredPromise> m_consumePromise;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (206420 => 206421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-09-27 07:52:29 UTC (rev 206420)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-09-27 07:58:48 UTC (rev 206421)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return adoptRef(*new FetchRequest(context, FetchBody(m_body), FetchHeaders::create(m_headers.get()), FetchRequest::InternalRequest(m_internalRequest)));
</del><ins>+ return adoptRef(*new FetchRequest(context, m_body.clone(), FetchHeaders::create(m_headers.get()), FetchRequest::InternalRequest(m_internalRequest)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* FetchRequest::activeDOMObjectName() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (206420 => 206421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-09-27 07:52:29 UTC (rev 206420)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-09-27 07:58:48 UTC (rev 206421)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(scriptExecutionContext());
</span><span class="cx"> ASSERT(!isDisturbedOrLocked());
</span><del>- return adoptRef(*new FetchResponse(*scriptExecutionContext(), FetchBody(m_body), FetchHeaders::create(headers()), ResourceResponse(m_response)));
</del><ins>+ return adoptRef(*new FetchResponse(*scriptExecutionContext(), m_body.clone(), FetchHeaders::create(headers()), ResourceResponse(m_response)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchResponse::fetch(ScriptExecutionContext& context, FetchRequest& request, FetchPromise&& promise)
</span></span></pre>
</div>
</div>
</body>
</html>