[Fetch API] Reflect spec changes of bodyUsed property

third_party/WebKit/Source/modules/fetch/Request.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/fetch/Request.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/FetchUtils.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/ThreadableLoader.h"
 #include "modules/fetch/BodyStreamBuffer.h"
+#include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/FetchBlobDataConsumerHandle.h"
 #include "modules/fetch/FetchManager.h"
 #include "modules/fetch/RequestInit.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/Referrer.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRequest.h"
 
 namespace blink {
@@ skipping 18 matching lines @@
     request->setCredentials(original->credentials());
     request->setRedirect(original->redirect());
     request->setIntegrity(original->integrity());
     // FIXME: Set cache mode.
     // TODO(yhirano): Set redirect mode.
     return request;
 }
 
 Request* Request::createRequestWithRequestOrString(ScriptState* scriptState, Request* inputRequest, const String& inputString, RequestInit& init, ExceptionState& exceptionState)
 {
-    // "1. Let |temporaryBody| be null."
-    BodyStreamBuffer* temporaryBody = nullptr;
-
-    if (inputRequest) {
-        // We check bodyUsed even when the body is null in spite of the
-        // spec. See https://github.com/whatwg/fetch/issues/61 for details.
-        if (inputRequest->bodyUsed()) {
-            exceptionState.throwTypeError("Cannot construct a Request with a Request object that has already been used.");
-            return nullptr;
-        }
+    // "1. If |input| is a Request object and it is disturbed, throw a
+    // TypeError.
+    if (inputRequest && inputRequest->bodyUsed()) {
+        exceptionState.throwTypeError("Cannot construct a Request with a Request object that has already been used.");
+        return nullptr;
     }
 
-    // "2. If |input| is a Request object and |input|'s body is non-null, run
-    // these substeps:"
-    if (inputRequest && inputRequest->hasBody()) {
-        // "1. If |input|'s used flag is set, throw a TypeError."
-        // "2. Set |temporaryBody| to |input|'s body."
-        if (inputRequest->bodyUsed()) {
-            exceptionState.throwTypeError("Cannot construct a Request with a Request object that has already been used.");
-            return nullptr;
-        }
-        temporaryBody = inputRequest->bodyBuffer();
-    }
+    // "2. Let |temporaryBody| be |input|'s request's body if |input| is a
+    // Request object, and null otherwise.
+    BodyStreamBuffer* temporaryBody = inputRequest ? inputRequest->bodyBuffer() : nullptr;
 
     // "3. Let |request| be |input|'s request, if |input| is a Request object,
     // and a new request otherwise."
     // "4. Let origin be entry settings object's origin."
     RefPtr<SecurityOrigin> origin = scriptState->executionContext()->securityOrigin();
 
     // TODO(yhirano):
     //   "5. Let window be client."
     //   "6. If request's window is an environment settings object and its
     //   origin is same origin with origin, set window to request's window."
@@ skipping 229 matching lines @@
     // "33. Set |r|'s body to |temporaryBody|.
     if (temporaryBody)
         r->m_request->setBuffer(temporaryBody);
 
     // "34. Set |r|'s MIME type to the result of extracting a MIME type from
     // |r|'s request's header list."
     r->m_request->setMIMEType(r->m_request->headerList()->extractMIMEType());
 
     // "35. If |input| is a Request object and |input|'s body is non-null, run
     // these substeps:"
-    // We set bodyUsed even when the body is null in spite of the
-    // spec. See https://github.com/whatwg/fetch/issues/61 for details.
-    if (inputRequest) {
-        // "1. Set |input|'s body to null."
-        inputRequest->m_request->setBuffer(nullptr);
-        // "2. Set |input|'s used flag."
-        inputRequest->setBodyPassed();
+    if (inputRequest && inputRequest->bodyBuffer()) {
+        // "1. Set |input|'s body to an empty byte stream."
+        inputRequest->m_request->setBuffer(new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle())));
+        // "2. Set |input|'s disturbed flag."
+        inputRequest->bodyBuffer()->stream()->setIsDisturbed();
     }
 
     // "36. Return |r|."
     return r;
 }
 
 Request* Request::create(ScriptState* scriptState, const RequestInfo& input, const Dictionary& init, ExceptionState& exceptionState)
 {
     ASSERT(!input.isNull());
     if (input.isUSVString())
@@ skipping 206 matching lines @@
     return "";
 }
 
 String Request::integrity() const
 {
     return m_request->integrity();
 }
 
 Request* Request::clone(ExceptionState& exceptionState)
 {
-    if (bodyUsed()) {
+    if (bodyUsed() || isBodyLocked()) {

[hiroshige, 2015/11/19 12:50:37]

nit: we write "isBodyLocked() || bodyUsed()" in some locations and "bodyUsed()
|| isBodyLocked()" in others; Using the same order makes the code easier to
search and read.

[yhirano, 2015/11/19 13:19:03]

Done.

         exceptionState.throwTypeError("Request body is already used");
         return nullptr;
     }
 
     FetchRequestData* request = m_request->clone(executionContext());
     Headers* headers = Headers::create(request->headerList());
     headers->setGuard(m_headers->guard());
     return new Request(executionContext(), request, headers);
 }
 
 FetchRequestData* Request::passRequestData()
 {
     ASSERT(!bodyUsed());
-    setBodyPassed();
-    FetchRequestData* newRequestData = m_request->pass(executionContext());
-    return newRequestData;
+    return m_request->pass(executionContext());
 }
 
 bool Request::hasBody() const
 {
     return bodyBuffer();
 }
 
 void Request::populateWebServiceWorkerRequest(WebServiceWorkerRequest& webRequest) const
 {
     webRequest.setMethod(method());
@@ skipping 18 matching lines @@
 }
 
 DEFINE_TRACE(Request)
 {
     Body::trace(visitor);
     visitor->trace(m_request);
     visitor->trace(m_headers);
 }
 
 } // namespace blink