<!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>[206737] 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/206737">206737</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-03 10:57:27 -0700 (Mon, 03 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove FetchBody::m_isEmpty
https://bugs.webkit.org/show_bug.cgi?id=162857
Patch by Youenn Fablet <youenn@apple.com> on 2016-10-03
Reviewed by Alex Christensen.
No change of behavior.
Moving handling of null bodies in FetchBodyOwner, by having an Optional<FetchBody> in FetchBodyOwner.
Moving storage of m_contentType in FetchBodyOwner.
Moving header storage from FetchResponse/FetchRequest to FetchBodyOwner, as it helps updating m_contentType.
* Modules/fetch/FetchBody.cpp: removing m_isEmpty and m_contentType.
(WebCore::FetchBody::extract): Computes the default content-type which is stored in FetchBodyOwner.
(WebCore::FetchBody::blob):
(WebCore::FetchBody::consume):
(WebCore::FetchBody::consumeAsStream):
(WebCore::FetchBody::loadingSucceeded):
(WebCore::FetchBody::bodyForInternalRequest):
(WebCore::FetchBody::clone):
* Modules/fetch/FetchBody.h:
(WebCore::FetchBody::loadingBody):
(WebCore::FetchBody::FetchBody):
* Modules/fetch/FetchBodyOwner.cpp:
(WebCore::FetchBodyOwner::FetchBodyOwner):
(WebCore::FetchBodyOwner::stop):
(WebCore::FetchBodyOwner::arrayBuffer):
(WebCore::FetchBodyOwner::blob):
(WebCore::FetchBodyOwner::cloneBody): Needs to clone m_contentType as well.
(WebCore::FetchBodyOwner::extractBody):
(WebCore::FetchBodyOwner::updateContentType):
(WebCore::FetchBodyOwner::consumeOnceLoadingFinished):
(WebCore::FetchBodyOwner::formData):
(WebCore::FetchBodyOwner::json):
(WebCore::FetchBodyOwner::text):
(WebCore::FetchBodyOwner::loadBlob):
(WebCore::FetchBodyOwner::blobLoadingSucceeded):
(WebCore::FetchBodyOwner::blobLoadingFailed):
(WebCore::FetchBodyOwner::finishBlobLoading):
* Modules/fetch/FetchBodyOwner.h:
(WebCore::FetchBodyOwner::body):
(WebCore::FetchBodyOwner::isBodyNull):
* Modules/fetch/FetchRequest.cpp:
(WebCore::FetchRequest::setBody):
(WebCore::FetchRequest::internalRequest):
(WebCore::FetchRequest::clone):
* Modules/fetch/FetchRequest.h:
(WebCore::FetchRequest::FetchRequest):
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::initializeWith):
(WebCore::FetchResponse::FetchResponse):
(WebCore::FetchResponse::cloneForJS):
(WebCore::FetchResponse::fetch):
(WebCore::FetchResponse::BodyLoader::didSucceed):
(WebCore::FetchResponse::BodyLoader::didReceiveResponse):
(WebCore::FetchResponse::BodyLoader::start):
(WebCore::FetchResponse::createReadableStreamSource):
* Modules/fetch/FetchResponse.h:</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="#trunkSourceWebCoreModulesfetchFetchBodyOwnercpp">trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyOwnerh">trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequestcpp">trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequesth">trunk/Source/WebCore/Modules/fetch/FetchRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseh">trunk/Source/WebCore/Modules/fetch/FetchResponse.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206736 => 206737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-03 17:44:29 UTC (rev 206736)
+++ trunk/Source/WebCore/ChangeLog 2016-10-03 17:57:27 UTC (rev 206737)
</span><span class="lines">@@ -1,3 +1,64 @@
</span><ins>+2016-10-03 Youenn Fablet <youenn@apple.com>
+
+ Remove FetchBody::m_isEmpty
+ https://bugs.webkit.org/show_bug.cgi?id=162857
+
+ Reviewed by Alex Christensen.
+
+ No change of behavior.
+
+ Moving handling of null bodies in FetchBodyOwner, by having an Optional<FetchBody> in FetchBodyOwner.
+ Moving storage of m_contentType in FetchBodyOwner.
+
+ Moving header storage from FetchResponse/FetchRequest to FetchBodyOwner, as it helps updating m_contentType.
+
+ * Modules/fetch/FetchBody.cpp: removing m_isEmpty and m_contentType.
+ (WebCore::FetchBody::extract): Computes the default content-type which is stored in FetchBodyOwner.
+ (WebCore::FetchBody::blob):
+ (WebCore::FetchBody::consume):
+ (WebCore::FetchBody::consumeAsStream):
+ (WebCore::FetchBody::loadingSucceeded):
+ (WebCore::FetchBody::bodyForInternalRequest):
+ (WebCore::FetchBody::clone):
+ * Modules/fetch/FetchBody.h:
+ (WebCore::FetchBody::loadingBody):
+ (WebCore::FetchBody::FetchBody):
+ * Modules/fetch/FetchBodyOwner.cpp:
+ (WebCore::FetchBodyOwner::FetchBodyOwner):
+ (WebCore::FetchBodyOwner::stop):
+ (WebCore::FetchBodyOwner::arrayBuffer):
+ (WebCore::FetchBodyOwner::blob):
+ (WebCore::FetchBodyOwner::cloneBody): Needs to clone m_contentType as well.
+ (WebCore::FetchBodyOwner::extractBody):
+ (WebCore::FetchBodyOwner::updateContentType):
+ (WebCore::FetchBodyOwner::consumeOnceLoadingFinished):
+ (WebCore::FetchBodyOwner::formData):
+ (WebCore::FetchBodyOwner::json):
+ (WebCore::FetchBodyOwner::text):
+ (WebCore::FetchBodyOwner::loadBlob):
+ (WebCore::FetchBodyOwner::blobLoadingSucceeded):
+ (WebCore::FetchBodyOwner::blobLoadingFailed):
+ (WebCore::FetchBodyOwner::finishBlobLoading):
+ * Modules/fetch/FetchBodyOwner.h:
+ (WebCore::FetchBodyOwner::body):
+ (WebCore::FetchBodyOwner::isBodyNull):
+ * Modules/fetch/FetchRequest.cpp:
+ (WebCore::FetchRequest::setBody):
+ (WebCore::FetchRequest::internalRequest):
+ (WebCore::FetchRequest::clone):
+ * Modules/fetch/FetchRequest.h:
+ (WebCore::FetchRequest::FetchRequest):
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::initializeWith):
+ (WebCore::FetchResponse::FetchResponse):
+ (WebCore::FetchResponse::cloneForJS):
+ (WebCore::FetchResponse::fetch):
+ (WebCore::FetchResponse::BodyLoader::didSucceed):
+ (WebCore::FetchResponse::BodyLoader::didReceiveResponse):
+ (WebCore::FetchResponse::BodyLoader::start):
+ (WebCore::FetchResponse::createReadableStreamSource):
+ * Modules/fetch/FetchResponse.h:
+
</ins><span class="cx"> 2016-10-03 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: result in WebCore::CSSParser::parseURI
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (206736 => 206737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-10-03 17:44:29 UTC (rev 206736)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-10-03 17:57:27 UTC (rev 206737)
</span><span class="lines">@@ -47,92 +47,41 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-FetchBody::FetchBody(Ref<const Blob>&& blob)
- : m_data(WTFMove(blob))
- , m_contentType(this->blobBody().type())
</del><ins>+Optional<FetchBody> FetchBody::extract(ScriptExecutionContext& context, JSC::ExecState& state, JSC::JSValue value, String& contentType)
</ins><span class="cx"> {
</span><del>-}
-
-FetchBody::FetchBody(DOMFormData& formData, Document& document)
- : m_data(FormData::createMultiPart(formData, formData.encoding(), &document))
- , m_contentType(makeString("multipart/form-data;boundary=", this->formDataBody().boundary().data()))
-{
-}
-
-FetchBody::FetchBody(String&& text)
- : m_data(WTFMove(text))
- , m_contentType(ASCIILiteral("text/plain;charset=UTF-8"))
-{
-}
-
-FetchBody::FetchBody(Ref<const ArrayBuffer>&& data)
- : m_data(WTFMove(data))
-{
-}
-
-FetchBody::FetchBody(Ref<const ArrayBufferView>&& dataView)
- : m_data(WTFMove(dataView))
-{
-}
-
-FetchBody::FetchBody(Ref<const URLSearchParams>&& url)
- : m_data(WTFMove(url))
- , m_contentType(ASCIILiteral("application/x-www-form-urlencoded;charset=UTF-8"))
-{
-}
-
-FetchBody::FetchBody(const String& contentType, const FetchBodyConsumer& consumer)
- : m_contentType(contentType)
- , m_consumer(consumer)
-{
-}
-
-FetchBody FetchBody::extract(ScriptExecutionContext& context, JSC::ExecState& state, JSC::JSValue value)
-{
- if (value.inherits(JSBlob::info()))
- return FetchBody(*JSBlob::toWrapped(value));
</del><ins>+ if (value.inherits(JSBlob::info())) {
+ auto& blob = *JSBlob::toWrapped(value);
+ contentType = blob.type();
+ return FetchBody(blob);
+ }
</ins><span class="cx"> if (value.inherits(JSDOMFormData::info())) {
</span><span class="cx"> ASSERT(!context.isWorkerGlobalScope());
</span><del>- return FetchBody(*JSDOMFormData::toWrapped(value), static_cast<Document&>(context));
</del><ins>+ auto& domFormData = *JSDOMFormData::toWrapped(value);
+ auto formData = FormData::createMultiPart(domFormData, domFormData.encoding(), &static_cast<Document&>(context));
+ contentType = makeString("multipart/form-data;boundary=", formData->boundary().data());
+ return FetchBody(WTFMove(formData));
</ins><span class="cx"> }
</span><del>- if (value.isString())
</del><ins>+ if (value.isString()) {
+ contentType = ASCIILiteral("text/plain;charset=UTF-8");
</ins><span class="cx"> return FetchBody(value.toWTFString(&state));
</span><del>- if (value.inherits(JSURLSearchParams::info()))
</del><ins>+ }
+ if (value.inherits(JSURLSearchParams::info())) {
+ contentType = ASCIILiteral("application/x-www-form-urlencoded;charset=UTF-8");
</ins><span class="cx"> return FetchBody(*JSURLSearchParams::toWrapped(value));
</span><del>- if (value.inherits(JSReadableStream::info())) {
- FetchBody body;
- body.m_isEmpty = false;
- return body;
- } if (value.inherits(JSC::JSArrayBuffer::info())) {
</del><ins>+ }
+ if (value.inherits(JSReadableStream::info()))
+ return FetchBody();
+ if (value.inherits(JSC::JSArrayBuffer::info())) {
</ins><span class="cx"> ArrayBuffer* data = toArrayBuffer(value);
</span><span class="cx"> ASSERT(data);
</span><del>- return { *data };
</del><ins>+ return FetchBody(*data);
</ins><span class="cx"> }
</span><span class="cx"> if (value.inherits(JSC::JSArrayBufferView::info()))
</span><del>- return { toArrayBufferView(value).releaseConstNonNull() };
</del><ins>+ return FetchBody(toArrayBufferView(value).releaseConstNonNull());
</ins><span class="cx">
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-FetchBody FetchBody::extractFromBody(FetchBody* body)
-{
- if (!body)
- return { };
-
- return FetchBody(WTFMove(*body));
-}
-
-void FetchBody::updateContentType(FetchHeaders& headers)
-{
- String contentType = headers.fastGet(HTTPHeaderName::ContentType);
- if (!contentType.isNull()) {
- m_contentType = contentType;
- return;
- }
- if (!m_contentType.isNull())
- headers.fastSet(HTTPHeaderName::ContentType, m_contentType);
-}
-
</del><span class="cx"> void FetchBody::arrayBuffer(FetchBodyOwner& owner, Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><span class="cx"> m_consumer.setType(FetchBodyConsumer::Type::ArrayBuffer);
</span><span class="lines">@@ -139,10 +88,10 @@
</span><span class="cx"> consume(owner, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchBody::blob(FetchBodyOwner& owner, Ref<DeferredPromise>&& promise)
</del><ins>+void FetchBody::blob(FetchBodyOwner& owner, Ref<DeferredPromise>&& promise, const String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> m_consumer.setType(FetchBodyConsumer::Type::Blob);
</span><del>- m_consumer.setContentType(Blob::normalizedContentType(extractMIMETypeFromMediaType(m_contentType)));
</del><ins>+ m_consumer.setContentType(Blob::normalizedContentType(extractMIMETypeFromMediaType(contentType)));
</ins><span class="cx"> consume(owner, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -194,16 +143,12 @@
</span><span class="cx"> consumeBlob(owner, WTFMove(promise));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (m_consumer.hasData()) {
- m_consumer.resolve(WTFMove(promise));
- return;
- }
</del><span class="cx"> if (isFormData()) {
</span><span class="cx"> // FIXME: Support consuming FormData.
</span><span class="cx"> promise->reject(0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- ASSERT_NOT_REACHED();
</del><ins>+ m_consumer.resolve(WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(READABLE_STREAM_API)
</span><span class="lines">@@ -227,12 +172,12 @@
</span><span class="cx"> } else if (isBlob()) {
</span><span class="cx"> owner.loadBlob(blobBody(), nullptr);
</span><span class="cx"> m_data = nullptr;
</span><del>- } else if (m_consumer.hasData())
</del><ins>+ } else if (isFormData())
+ source.error(ASCIILiteral("not implemented"));
+ else if (m_consumer.hasData())
</ins><span class="cx"> closeStream = source.enqueue(m_consumer.takeAsArrayBuffer());
</span><del>- else if (isEmpty())
</del><ins>+ else
</ins><span class="cx"> closeStream = true;
</span><del>- else
- source.error(ASCIILiteral("not implemented"));
</del><span class="cx">
</span><span class="cx"> if (closeStream)
</span><span class="cx"> source.close();
</span><span class="lines">@@ -275,7 +220,6 @@
</span><span class="cx">
</span><span class="cx"> void FetchBody::loadingSucceeded()
</span><span class="cx"> {
</span><del>- m_isEmpty = !m_consumer.hasData();
</del><span class="cx"> if (m_consumePromise)
</span><span class="cx"> m_consumer.resolve(m_consumePromise.releaseNonNull());
</span><span class="cx"> }
</span><span class="lines">@@ -282,8 +226,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<FormData> FetchBody::bodyForInternalRequest(ScriptExecutionContext& context) const
</span><span class="cx"> {
</span><del>- if (isEmpty())
- return nullptr;
</del><span class="cx"> if (isText())
</span><span class="cx"> return FormData::create(UTF8Encoding().encode(textBody(), EntitiesForUnencodables));
</span><span class="cx"> if (isURLSearchParams())
</span><span class="lines">@@ -310,8 +252,7 @@
</span><span class="cx"> FetchBody FetchBody::clone() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_consumePromise);
</span><del>- FetchBody clone(m_contentType, m_consumer);
- clone.m_isEmpty = m_isEmpty;
</del><ins>+ FetchBody clone(m_consumer);
</ins><span class="cx">
</span><span class="cx"> if (isArrayBuffer())
</span><span class="cx"> clone.m_data = arrayBufferBody();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (206736 => 206737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-10-03 17:44:29 UTC (rev 206736)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-10-03 17:57:27 UTC (rev 206737)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "FormData.h"
</span><span class="cx"> #include "JSDOMPromise.h"
</span><span class="cx"> #include "URLSearchParams.h"
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/Variant.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -55,7 +56,7 @@
</span><span class="cx"> class FetchBody {
</span><span class="cx"> public:
</span><span class="cx"> void arrayBuffer(FetchBodyOwner&, Ref<DeferredPromise>&&);
</span><del>- void blob(FetchBodyOwner&, Ref<DeferredPromise>&&);
</del><ins>+ void blob(FetchBodyOwner&, Ref<DeferredPromise>&&, const String&);
</ins><span class="cx"> void json(FetchBodyOwner&, Ref<DeferredPromise>&&);
</span><span class="cx"> void text(FetchBodyOwner&, Ref<DeferredPromise>&&);
</span><span class="cx"> void formData(FetchBodyOwner&, Ref<DeferredPromise>&& promise) { promise.get().reject(0); }
</span><span class="lines">@@ -64,7 +65,6 @@
</span><span class="cx"> void consumeAsStream(FetchBodyOwner&, FetchResponseSource&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool isEmpty() const { return m_isEmpty; }
</del><span class="cx"> bool isBlob() const { return std::experimental::holds_alternative<Ref<const Blob>>(m_data); }
</span><span class="cx"> bool isFormData() const { return std::experimental::holds_alternative<Ref<FormData>>(m_data); }
</span><span class="cx"> bool isArrayBuffer() const { return std::experimental::holds_alternative<Ref<const ArrayBuffer>>(m_data); }
</span><span class="lines">@@ -72,14 +72,9 @@
</span><span class="cx"> bool isURLSearchParams() const { return std::experimental::holds_alternative<Ref<const URLSearchParams>>(m_data); }
</span><span class="cx"> bool isText() const { return std::experimental::holds_alternative<String>(m_data); }
</span><span class="cx">
</span><del>- void updateContentType(FetchHeaders&);
- void setContentType(const String& contentType) { m_contentType = contentType; }
- String contentType() const { return m_contentType; }
</del><ins>+ static Optional<FetchBody> extract(ScriptExecutionContext&, JSC::ExecState&, JSC::JSValue, String&);
+ static FetchBody loadingBody() { return { }; }
</ins><span class="cx">
</span><del>- static FetchBody extract(ScriptExecutionContext&, JSC::ExecState&, JSC::JSValue);
- static FetchBody extractFromBody(FetchBody*);
- FetchBody() : m_isEmpty(true) { }
-
</del><span class="cx"> void loadingFailed();
</span><span class="cx"> void loadingSucceeded();
</span><span class="cx">
</span><span class="lines">@@ -93,13 +88,14 @@
</span><span class="cx"> FetchBody clone() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FetchBody(Ref<const Blob>&&);
- FetchBody(Ref<const ArrayBuffer>&&);
- FetchBody(Ref<const ArrayBufferView>&&);
- FetchBody(DOMFormData&, Document&);
- FetchBody(String&&);
- FetchBody(Ref<const URLSearchParams>&&);
- FetchBody(const String&, const FetchBodyConsumer&);
</del><ins>+ explicit FetchBody(Ref<const Blob>&& data) : m_data(WTFMove(data)) { }
+ explicit FetchBody(Ref<const ArrayBuffer>&& data) : m_data(WTFMove(data)) { }
+ explicit FetchBody(Ref<const ArrayBufferView>&& data) : m_data(WTFMove(data)) { }
+ explicit FetchBody(Ref<FormData>&& data) : m_data(WTFMove(data)) { }
+ explicit FetchBody(String&& data) : m_data(WTFMove(data)) { }
+ explicit FetchBody(Ref<const URLSearchParams>&& data) : m_data(WTFMove(data)) { }
+ explicit FetchBody(const FetchBodyConsumer& consumer) : m_consumer(consumer) { }
+ FetchBody() = default;
</ins><span class="cx">
</span><span class="cx"> void consume(FetchBodyOwner&, Ref<DeferredPromise>&&);
</span><span class="cx">
</span><span class="lines">@@ -118,10 +114,7 @@
</span><span class="cx"> const URLSearchParams& urlSearchParamsBody() const { return std::experimental::get<Ref<const URLSearchParams>>(m_data).get(); }
</span><span class="cx">
</span><span class="cx"> std::experimental::variant<std::nullptr_t, Ref<const Blob>, Ref<FormData>, Ref<const ArrayBuffer>, Ref<const ArrayBufferView>, Ref<const URLSearchParams>, String> m_data { nullptr };
</span><del>- String m_contentType;
</del><span class="cx">
</span><del>- bool m_isEmpty { false };
-
</del><span class="cx"> FetchBodyConsumer m_consumer { FetchBodyConsumer::Type::None };
</span><span class="cx"> RefPtr<DeferredPromise> m_consumePromise;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (206736 => 206737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-10-03 17:44:29 UTC (rev 206736)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-10-03 17:57:27 UTC (rev 206737)
</span><span class="lines">@@ -40,9 +40,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-FetchBodyOwner::FetchBodyOwner(ScriptExecutionContext& context, FetchBody&& body)
</del><ins>+FetchBodyOwner::FetchBodyOwner(ScriptExecutionContext& context, Optional<FetchBody>&& body, Ref<FetchHeaders>&& headers)
</ins><span class="cx"> : ActiveDOMObject(&context)
</span><span class="cx"> , m_body(WTFMove(body))
</span><ins>+ , m_headers(WTFMove(headers))
</ins><span class="cx"> {
</span><span class="cx"> suspendIfNeeded();
</span><span class="cx"> }
</span><span class="lines">@@ -49,7 +50,8 @@
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::stop()
</span><span class="cx"> {
</span><del>- m_body.cleanConsumePromise();
</del><ins>+ if (m_body)
+ m_body->cleanConsumePromise();
</ins><span class="cx">
</span><span class="cx"> if (m_blobLoader) {
</span><span class="cx"> bool isUniqueReference = hasOneRef();
</span><span class="lines">@@ -75,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::arrayBuffer(Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><del>- if (m_body.isEmpty()) {
</del><ins>+ if (isBodyNull()) {
</ins><span class="cx"> fulfillPromiseWithArrayBuffer(WTFMove(promise), nullptr, 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -84,13 +86,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><del>- m_body.arrayBuffer(*this, WTFMove(promise));
</del><ins>+ m_body->arrayBuffer(*this, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::blob(Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><del>- if (m_body.isEmpty()) {
- promise->resolve(Blob::create(Vector<uint8_t>(), Blob::normalizedContentType(extractMIMETypeFromMediaType(m_body.contentType()))));
</del><ins>+ if (isBodyNull()) {
+ promise->resolve(Blob::create(Vector<uint8_t>(), Blob::normalizedContentType(extractMIMETypeFromMediaType(m_contentType))));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (isDisturbedOrLocked()) {
</span><span class="lines">@@ -98,9 +100,33 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><del>- m_body.blob(*this, WTFMove(promise));
</del><ins>+ m_body->blob(*this, WTFMove(promise), m_contentType);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void FetchBodyOwner::cloneBody(const FetchBodyOwner& owner)
+{
+ m_contentType = owner.m_contentType;
+ if (owner.isBodyNull())
+ return;
+ m_body = owner.m_body->clone();
+}
+
+void FetchBodyOwner::extractBody(ScriptExecutionContext& context, JSC::ExecState& state, JSC::JSValue value)
+{
+ m_body = FetchBody::extract(context, state, value, m_contentType);
+}
+
+void FetchBodyOwner::updateContentType()
+{
+ String contentType = m_headers->fastGet(HTTPHeaderName::ContentType);
+ if (!contentType.isNull()) {
+ m_contentType = WTFMove(contentType);
+ return;
+ }
+ if (!m_contentType.isNull())
+ m_headers->fastSet(HTTPHeaderName::ContentType, m_contentType);
+}
+
</ins><span class="cx"> void FetchBodyOwner::consumeOnceLoadingFinished(FetchBodyConsumer::Type type, Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><span class="cx"> if (isDisturbedOrLocked()) {
</span><span class="lines">@@ -108,12 +134,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><del>- m_body.consumeOnceLoadingFinished(type, WTFMove(promise));
</del><ins>+ m_body->consumeOnceLoadingFinished(type, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::formData(Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><del>- if (m_body.isEmpty()) {
</del><ins>+ if (isBodyNull()) {
</ins><span class="cx"> promise->reject(0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -122,12 +148,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><del>- m_body.formData(*this, WTFMove(promise));
</del><ins>+ m_body->formData(*this, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::json(Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><del>- if (m_body.isEmpty()) {
</del><ins>+ if (isBodyNull()) {
</ins><span class="cx"> promise->reject(SYNTAX_ERR);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -136,12 +162,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><del>- m_body.json(*this, WTFMove(promise));
</del><ins>+ m_body->json(*this, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::text(Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><del>- if (m_body.isEmpty()) {
</del><ins>+ if (isBodyNull()) {
</ins><span class="cx"> promise->resolve(String());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -150,7 +176,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_isDisturbed = true;
</span><del>- m_body.text(*this, WTFMove(promise));
</del><ins>+ m_body->text(*this, WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::loadBlob(const Blob& blob, FetchBodyConsumer* consumer)
</span><span class="lines">@@ -158,9 +184,10 @@
</span><span class="cx"> // Can only be called once for a body instance.
</span><span class="cx"> ASSERT(isDisturbed());
</span><span class="cx"> ASSERT(!m_blobLoader);
</span><ins>+ ASSERT(!isBodyNull());
</ins><span class="cx">
</span><span class="cx"> if (!scriptExecutionContext()) {
</span><del>- m_body.loadingFailed();
</del><ins>+ m_body->loadingFailed();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -169,7 +196,7 @@
</span><span class="cx">
</span><span class="cx"> m_blobLoader->loader->start(*scriptExecutionContext(), blob);
</span><span class="cx"> if (!m_blobLoader->loader->isStarted()) {
</span><del>- m_body.loadingFailed();
</del><ins>+ m_body->loadingFailed();
</ins><span class="cx"> m_blobLoader = Nullopt;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -186,6 +213,7 @@
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::blobLoadingSucceeded()
</span><span class="cx"> {
</span><ins>+ ASSERT(!isBodyNull());
</ins><span class="cx"> #if ENABLE(READABLE_STREAM_API)
</span><span class="cx"> if (m_readableStreamSource) {
</span><span class="cx"> m_readableStreamSource->close();
</span><span class="lines">@@ -192,12 +220,13 @@
</span><span class="cx"> m_readableStreamSource = nullptr;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- m_body.loadingSucceeded();
</del><ins>+ m_body->loadingSucceeded();
</ins><span class="cx"> finishBlobLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchBodyOwner::blobLoadingFailed()
</span><span class="cx"> {
</span><ins>+ ASSERT(!isBodyNull());
</ins><span class="cx"> #if ENABLE(READABLE_STREAM_API)
</span><span class="cx"> if (m_readableStreamSource) {
</span><span class="cx"> if (!m_readableStreamSource->isCancelling())
</span><span class="lines">@@ -205,7 +234,7 @@
</span><span class="cx"> m_readableStreamSource = nullptr;
</span><span class="cx"> } else
</span><span class="cx"> #endif
</span><del>- m_body.loadingFailed();
</del><ins>+ m_body->loadingFailed();
</ins><span class="cx">
</span><span class="cx"> finishBlobLoading();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h (206736 => 206737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-10-03 17:44:29 UTC (rev 206736)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-10-03 17:57:27 UTC (rev 206737)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "FetchBody.h"
</span><ins>+#include "FetchHeaders.h"
</ins><span class="cx"> #include "FetchLoader.h"
</span><span class="cx"> #include "FetchLoaderClient.h"
</span><span class="cx"> #include "FetchResponseSource.h"
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> class FetchBodyOwner : public RefCounted<FetchBodyOwner>, public ActiveDOMObject {
</span><span class="cx"> public:
</span><del>- FetchBodyOwner(ScriptExecutionContext&, FetchBody&&);
</del><ins>+ FetchBodyOwner(ScriptExecutionContext&, Optional<FetchBody>&&, Ref<FetchHeaders>&&);
</ins><span class="cx">
</span><span class="cx"> // Exposed Body API
</span><span class="cx"> bool isDisturbed() const { return m_isDisturbed; };
</span><span class="lines">@@ -59,8 +60,13 @@
</span><span class="cx"> bool isActive() const { return !!m_blobLoader; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- const FetchBody& body() const { return m_body; }
- FetchBody& body() { return m_body; }
</del><ins>+ const FetchBody& body() const { return *m_body; }
+ FetchBody& body() { return *m_body; }
+ bool isBodyNull() const { return !m_body; }
+ void cloneBody(const FetchBodyOwner&);
+
+ void extractBody(ScriptExecutionContext&, JSC::ExecState&, JSC::JSValue);
+ void updateContentType();
</ins><span class="cx"> void consumeOnceLoadingFinished(FetchBodyConsumer::Type, Ref<DeferredPromise>&&);
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API
</span><span class="lines">@@ -89,11 +95,13 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- FetchBody m_body;
</del><ins>+ Optional<FetchBody> m_body;
+ String m_contentType;
</ins><span class="cx"> bool m_isDisturbed { false };
</span><span class="cx"> #if ENABLE(READABLE_STREAM_API)
</span><span class="cx"> RefPtr<FetchResponseSource> m_readableStreamSource;
</span><span class="cx"> #endif
</span><ins>+ Ref<FetchHeaders> m_headers;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Optional<BlobLoader> m_blobLoader;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (206736 => 206737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-10-03 17:44:29 UTC (rev 206736)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-10-03 17:57:27 UTC (rev 206737)
</span><span class="lines">@@ -261,23 +261,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(scriptExecutionContext());
</span><del>- m_body = FetchBody::extract(*scriptExecutionContext(), execState, body);
- if (m_body.isEmpty()) {
</del><ins>+ extractBody(*scriptExecutionContext(), execState, body);
+ if (isBodyNull()) {
</ins><span class="cx"> ec = TypeError;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- }
- else if (request && !request->m_body.isEmpty()) {
</del><ins>+ } else if (request && !request->isBodyNull()) {
</ins><span class="cx"> if (!methodCanHaveBody(m_internalRequest)) {
</span><span class="cx"> ec = TypeError;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_body = FetchBody::extractFromBody(&request->m_body);
</del><ins>+ m_body = WTFMove(request->m_body);
</ins><span class="cx"> request->setDisturbed();
</span><span class="cx"> }
</span><del>-
- m_body.updateContentType(m_headers);
</del><ins>+ updateContentType();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String FetchRequest::referrer() const
</span><span class="lines">@@ -302,8 +300,10 @@
</span><span class="cx">
</span><span class="cx"> ResourceRequest request = m_internalRequest.request;
</span><span class="cx"> request.setHTTPHeaderFields(m_headers->internalHeaders());
</span><del>- request.setHTTPBody(body().bodyForInternalRequest(*scriptExecutionContext()));
</del><span class="cx">
</span><ins>+ if (!isBodyNull())
+ request.setHTTPBody(body().bodyForInternalRequest(*scriptExecutionContext()));
+
</ins><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -314,7 +314,9 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return adoptRef(*new FetchRequest(context, m_body.clone(), FetchHeaders::create(m_headers.get()), FetchRequest::InternalRequest(m_internalRequest)));
</del><ins>+ auto clone = adoptRef(*new FetchRequest(context, Nullopt, FetchHeaders::create(m_headers.get()), FetchRequest::InternalRequest(m_internalRequest)));
+ clone->cloneBody(*this);
+ return WTFMove(clone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* FetchRequest::activeDOMObjectName() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.h (206736 => 206737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.h 2016-10-03 17:44:29 UTC (rev 206736)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.h 2016-10-03 17:57:27 UTC (rev 206737)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx">
</span><span class="cx"> #include "FetchBodyOwner.h"
</span><del>-#include "FetchHeaders.h"
</del><span class="cx"> #include "FetchOptions.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx">
</span><span class="lines">@@ -45,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> class FetchRequest final : public FetchBodyOwner {
</span><span class="cx"> public:
</span><del>- static Ref<FetchRequest> create(ScriptExecutionContext& context) { return adoptRef(*new FetchRequest(context, { }, FetchHeaders::create(FetchHeaders::Guard::Request), { })); }
</del><ins>+ static Ref<FetchRequest> create(ScriptExecutionContext& context) { return adoptRef(*new FetchRequest(context, Nullopt, FetchHeaders::create(FetchHeaders::Guard::Request), { })); }
</ins><span class="cx">
</span><span class="cx"> FetchHeaders* initializeWith(FetchRequest&, const Dictionary&, ExceptionCode&);
</span><span class="cx"> FetchHeaders* initializeWith(const String&, const Dictionary&, ExceptionCode&);
</span><span class="lines">@@ -95,7 +94,7 @@
</span><span class="cx"> const String& internalRequestReferrer() const { return m_internalRequest.referrer; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FetchRequest(ScriptExecutionContext&, FetchBody&&, Ref<FetchHeaders>&&, InternalRequest&&);
</del><ins>+ FetchRequest(ScriptExecutionContext&, Optional<FetchBody>&&, Ref<FetchHeaders>&&, InternalRequest&&);
</ins><span class="cx">
</span><span class="cx"> void initializeOptions(const Dictionary&, ExceptionCode&);
</span><span class="cx">
</span><span class="lines">@@ -103,14 +102,12 @@
</span><span class="cx"> const char* activeDOMObjectName() const final;
</span><span class="cx"> bool canSuspendForDocumentSuspension() const final;
</span><span class="cx">
</span><del>- Ref<FetchHeaders> m_headers;
</del><span class="cx"> InternalRequest m_internalRequest;
</span><span class="cx"> mutable String m_requestURL;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline FetchRequest::FetchRequest(ScriptExecutionContext& context, FetchBody&& body, Ref<FetchHeaders>&& headers, InternalRequest&& internalRequest)
- : FetchBodyOwner(context, WTFMove(body))
- , m_headers(WTFMove(headers))
</del><ins>+inline FetchRequest::FetchRequest(ScriptExecutionContext& context, Optional<FetchBody>&& body, Ref<FetchHeaders>&& headers, InternalRequest&& internalRequest)
+ : FetchBodyOwner(context, WTFMove(body), WTFMove(headers))
</ins><span class="cx"> , m_internalRequest(WTFMove(internalRequest))
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (206736 => 206737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-10-03 17:44:29 UTC (rev 206736)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-10-03 17:57:27 UTC (rev 206737)
</span><span class="lines">@@ -83,14 +83,13 @@
</span><span class="cx"> void FetchResponse::initializeWith(JSC::ExecState& execState, JSC::JSValue body)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(scriptExecutionContext());
</span><del>- m_body = FetchBody::extract(*scriptExecutionContext(), execState, body);
- m_body.updateContentType(m_headers);
</del><ins>+ extractBody(*scriptExecutionContext(), execState, body);
+ updateContentType();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-FetchResponse::FetchResponse(ScriptExecutionContext& context, FetchBody&& body, Ref<FetchHeaders>&& headers, ResourceResponse&& response)
- : FetchBodyOwner(context, WTFMove(body))
</del><ins>+FetchResponse::FetchResponse(ScriptExecutionContext& context, Optional<FetchBody>&& body, Ref<FetchHeaders>&& headers, ResourceResponse&& response)
+ : FetchBodyOwner(context, WTFMove(body), WTFMove(headers))
</ins><span class="cx"> , m_response(WTFMove(response))
</span><del>- , m_headers(WTFMove(headers))
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,12 +97,15 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(scriptExecutionContext());
</span><span class="cx"> ASSERT(!isDisturbedOrLocked());
</span><del>- return adoptRef(*new FetchResponse(*scriptExecutionContext(), m_body.clone(), FetchHeaders::create(headers()), ResourceResponse(m_response)));
</del><ins>+
+ auto clone = adoptRef(*new FetchResponse(*scriptExecutionContext(), Nullopt, FetchHeaders::create(headers()), ResourceResponse(m_response)));
+ clone->cloneBody(*this);
+ return clone;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchResponse::fetch(ScriptExecutionContext& context, FetchRequest& request, FetchPromise&& promise)
</span><span class="cx"> {
</span><del>- auto response = adoptRef(*new FetchResponse(context, { }, FetchHeaders::create(FetchHeaders::Guard::Immutable), { }));
</del><ins>+ auto response = adoptRef(*new FetchResponse(context, FetchBody::loadingBody(), FetchHeaders::create(FetchHeaders::Guard::Immutable), { }));
</ins><span class="cx">
</span><span class="cx"> // Setting pending activity until BodyLoader didFail or didSucceed callback is called.
</span><span class="cx"> response->setPendingActivity(response.ptr());
</span><span class="lines">@@ -123,10 +125,10 @@
</span><span class="cx"> void FetchResponse::BodyLoader::didSucceed()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_response.hasPendingActivity());
</span><del>- m_response.m_body.loadingSucceeded();
</del><ins>+ m_response.m_body->loadingSucceeded();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(READABLE_STREAM_API)
</span><del>- if (m_response.m_readableStreamSource && m_response.body().isEmpty()) {
</del><ins>+ if (m_response.m_readableStreamSource && !m_response.body().consumer().hasData()) {
</ins><span class="cx"> // We only close the stream if FetchBody already enqueued all data.
</span><span class="cx"> // Otherwise, FetchBody will close the stream after enqueuing the data.
</span><span class="cx"> m_response.m_readableStreamSource->close();
</span><span class="lines">@@ -174,7 +176,6 @@
</span><span class="cx">
</span><span class="cx"> m_response.m_response = resourceResponse;
</span><span class="cx"> m_response.m_headers->filterAndFill(resourceResponse.httpHeaderFields(), FetchHeaders::Guard::Response);
</span><del>- m_response.m_body.setContentType(m_response.m_headers->fastGet(HTTPHeaderName::ContentType));
</del><span class="cx">
</span><span class="cx"> std::exchange(m_promise, Nullopt)->resolve(m_response);
</span><span class="cx"> }
</span><span class="lines">@@ -194,7 +195,7 @@
</span><span class="cx">
</span><span class="cx"> bool FetchResponse::BodyLoader::start(ScriptExecutionContext& context, const FetchRequest& request)
</span><span class="cx"> {
</span><del>- m_loader = std::make_unique<FetchLoader>(*this, &m_response.m_body.consumer());
</del><ins>+ m_loader = std::make_unique<FetchLoader>(*this, &m_response.m_body->consumer());
</ins><span class="cx"> m_loader->start(context, request);
</span><span class="cx"> return m_loader->isStarted();
</span><span class="cx"> }
</span><span class="lines">@@ -278,7 +279,7 @@
</span><span class="cx"> ASSERT(!m_readableStreamSource);
</span><span class="cx"> ASSERT(!m_isDisturbed);
</span><span class="cx">
</span><del>- if (body().isEmpty() && !isLoading())
</del><ins>+ if (isBodyNull())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> m_readableStreamSource = adoptRef(*new FetchResponseSource(*this));
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (206736 => 206737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-10-03 17:44:29 UTC (rev 206736)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-10-03 17:57:27 UTC (rev 206737)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx">
</span><span class="cx"> #include "FetchBodyOwner.h"
</span><del>-#include "FetchHeaders.h"
</del><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include <runtime/TypedArrays.h>
</span><span class="cx">
</span><span class="lines">@@ -53,7 +52,7 @@
</span><span class="cx"> public:
</span><span class="cx"> using Type = ResourceResponse::Type;
</span><span class="cx">
</span><del>- static Ref<FetchResponse> create(ScriptExecutionContext& context) { return adoptRef(*new FetchResponse(context, { }, FetchHeaders::create(FetchHeaders::Guard::Response), ResourceResponse())); }
</del><ins>+ static Ref<FetchResponse> create(ScriptExecutionContext& context) { return adoptRef(*new FetchResponse(context, Nullopt, FetchHeaders::create(FetchHeaders::Guard::Response), ResourceResponse())); }
</ins><span class="cx"> static Ref<FetchResponse> error(ScriptExecutionContext&);
</span><span class="cx"> static RefPtr<FetchResponse> redirect(ScriptExecutionContext&, const String&, int, ExceptionCode&);
</span><span class="cx">
</span><span class="lines">@@ -88,7 +87,7 @@
</span><span class="cx"> bool isLoading() const { return !!m_bodyLoader; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FetchResponse(ScriptExecutionContext&, FetchBody&&, Ref<FetchHeaders>&&, ResourceResponse&&);
</del><ins>+ FetchResponse(ScriptExecutionContext&, Optional<FetchBody>&&, Ref<FetchHeaders>&&, ResourceResponse&&);
</ins><span class="cx">
</span><span class="cx"> static void startFetching(ScriptExecutionContext&, const FetchRequest&, FetchPromise&&);
</span><span class="cx">
</span><span class="lines">@@ -121,7 +120,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ResourceResponse m_response;
</span><del>- Ref<FetchHeaders> m_headers;
</del><span class="cx"> Optional<BodyLoader> m_bodyLoader;
</span><span class="cx"> mutable String m_responseURL;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>