[Fetch API] Send request body as a FormData.

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"
@@ skipping 29 matching lines @@
     request->setSameOriginDataURLFlag(true);
     request->mutableReferrer()->setClient();
     request->setMode(original->mode());
     request->setCredentials(original->credentials());
     request->setRedirect(original->redirect());
     // FIXME: Set cache mode.
     // TODO(yhirano): Set redirect mode.
     return request;
 }
 
-Request* Request::createRequestWithRequestOrString(ScriptState* scriptState, Request* inputRequest, const String& inputString, const RequestInit& init, ExceptionState& exceptionState)
+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;
@@ skipping 151 matching lines @@
         r->headers()->fillWith(init.headersDictionary, exceptionState);
     } else {
         ASSERT(headers);
         r->headers()->fillWith(headers, exceptionState);
     }
     if (exceptionState.hadException())
         return nullptr;
 
     // "31. If either |init|'s body member is present or |temporaryBody| is
     // non-null, and |request|'s method is `GET` or `HEAD`, throw a TypeError.
-    if (init.bodyBlobHandle || temporaryBody) {
+    if (init.body || temporaryBody) {
         if (request->method() == "GET" || request->method() == "HEAD") {
             exceptionState.throwTypeError("Request with GET/HEAD method cannot have body.");
             return nullptr;
         }
     }
 
     // "32. If |init|'s body member is present, run these substeps:"
-    if (init.bodyBlobHandle) {
+    if (init.body) {
         // "1. Let |stream| and |Content-Type| be the result of extracting
         //  |init|'s body member."
         // "2. Set |temporaryBody| to |stream|.
         // "3. If |Content-Type| is non-null and |r|'s request's header list
         //  contains no header named `Content-Type`, append
         //  `Content-Type`/|Content-Type| to |r|'s Headers object. Rethrow any
         //  exception."
-        temporaryBody = new BodyStreamBuffer(FetchBlobDataConsumerHandle::create(scriptState->executionContext(), init.bodyBlobHandle));
-        if (!init.bodyBlobHandle->type().isEmpty() && !r->headers()->has("Content-Type", exceptionState)) {
-            r->headers()->append("Content-Type", init.bodyBlobHandle->type(), exceptionState);
+        temporaryBody = new BodyStreamBuffer(init.body.release());
+        if (!init.contentType.isEmpty() && !r->headers()->has("Content-Type", exceptionState)) {
+            r->headers()->append("Content-Type", init.contentType, exceptionState);
         }
         if (exceptionState.hadException())
             return nullptr;
     }
 
     // "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
@@ skipping 23 matching lines @@
     return create(scriptState, input.getAsRequest(), init, exceptionState);
 }
 
 Request* Request::create(ScriptState* scriptState, const String& input, ExceptionState& exceptionState)
 {
     return create(scriptState, input, Dictionary(), exceptionState);
 }
 
 Request* Request::create(ScriptState* scriptState, const String& input, const Dictionary& init, ExceptionState& exceptionState)
 {
-    return createRequestWithRequestOrString(scriptState, nullptr, input, RequestInit(scriptState->executionContext(), init, exceptionState), exceptionState);
+    RequestInit requestInit(scriptState->executionContext(), init, exceptionState);
+    return createRequestWithRequestOrString(scriptState, nullptr, input, requestInit, exceptionState);
 }
 
 Request* Request::create(ScriptState* scriptState, Request* input, ExceptionState& exceptionState)
 {
     return create(scriptState, input, Dictionary(), exceptionState);
 }
 
 Request* Request::create(ScriptState* scriptState, Request* input, const Dictionary& init, ExceptionState& exceptionState)
 {
-    return createRequestWithRequestOrString(scriptState, input, String(), RequestInit(scriptState->executionContext(), init, exceptionState), exceptionState);
+    RequestInit requestInit(scriptState->executionContext(), init, exceptionState);
+    return createRequestWithRequestOrString(scriptState, input, String(), requestInit, exceptionState);
 }
 
 Request* Request::create(ExecutionContext* context, FetchRequestData* request)
 {
     return new Request(context, request);
 }
 
 Request::Request(ExecutionContext* context, FetchRequestData* request)
     : Body(context)
     , m_request(request)
@@ skipping 222 matching lines @@
 }
 
 DEFINE_TRACE(Request)
 {
     Body::trace(visitor);
     visitor->trace(m_request);
     visitor->trace(m_headers);
 }
 
 } // namespace blink