[Fetch API] Put body members directly on Response/Request

Source/modules/serviceworkers/Response.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 "Response.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/fileapi/Blob.h"
-#include "modules/serviceworkers/FetchBodyStream.h"
 #include "modules/serviceworkers/ResponseInit.h"
 #include "public/platform/WebServiceWorkerResponse.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/ArrayBufferView.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 namespace {
 
@@ skipping 18 matching lines @@
     for (HashMap<String, String>::const_iterator i = webResponse.headers().begin(), end = webResponse.headers().end(); i != end; ++i) {
         headers->append(i->key, i->value, exceptionState);
         if (exceptionState.hadException())
             return 0;
     }
     return headers;
 }
 
 }
 
-Response* Response::create(Blob* body, const Dictionary& responseInit, ExceptionState& exceptionState)
+Response* Response::create(ExecutionContext* context, Blob* body, const Dictionary& responseInit, ExceptionState& exceptionState)
 {
-    return create(body, ResponseInit(responseInit), exceptionState);
+    return create(context, body, ResponseInit(responseInit), exceptionState);
 }
 
-Response* Response::create(const String& body, const Dictionary& responseInit, ExceptionState& exceptionState)
+Response* Response::create(ExecutionContext* context, const String& body, const Dictionary& responseInit, ExceptionState& exceptionState)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->appendText(body, false);
     // "Set |Content-Type| to `text/plain;charset=UTF-8`."
     blobData->setContentType("text/plain;charset=UTF-8");
     const long long length = blobData->length();
     RefPtrWillBeRawPtr<Blob> blob = Blob::create(BlobDataHandle::create(blobData.release(), length));
-    return create(blob.get(), ResponseInit(responseInit), exceptionState);
+    return create(context, blob.get(), ResponseInit(responseInit), exceptionState);
 }
 
-Response* Response::create(const ArrayBuffer* body, const Dictionary& responseInit, ExceptionState& exceptionState)
+Response* Response::create(ExecutionContext* context, const ArrayBuffer* body, const Dictionary& responseInit, ExceptionState& exceptionState)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->appendArrayBuffer(body);
     const long long length = blobData->length();
     RefPtrWillBeRawPtr<Blob> blob = Blob::create(BlobDataHandle::create(blobData.release(), length));
-    return create(blob.get(), ResponseInit(responseInit), exceptionState);
+    return create(context, blob.get(), ResponseInit(responseInit), exceptionState);
 }
 
-Response* Response::create(const ArrayBufferView* body, const Dictionary& responseInit, ExceptionState& exceptionState)
+Response* Response::create(ExecutionContext* context, const ArrayBufferView* body, const Dictionary& responseInit, ExceptionState& exceptionState)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->appendArrayBufferView(body);
     const long long length = blobData->length();
     RefPtrWillBeRawPtr<Blob> blob = Blob::create(BlobDataHandle::create(blobData.release(), length));
-    return create(blob.get(), ResponseInit(responseInit), exceptionState);
+    return create(context, blob.get(), ResponseInit(responseInit), exceptionState);
 }
 
-Response* Response::create(Blob* body, const ResponseInit& responseInit, ExceptionState& exceptionState)
+Response* Response::create(ExecutionContext* context, Blob* body, const ResponseInit& responseInit, ExceptionState& exceptionState)
 {
     // "1. If |init|'s status member is not in the range 200 to 599, throw a
     // RangeError."
     if (responseInit.status < 200 || 599 < responseInit.status) {
         exceptionState.throwRangeError("Invalid status");
         return 0;
     }
 
     // FIXME: "2. If |init|'s statusText member does not match the Reason-Phrase
     //        token production, throw a TypeError."
 
     // "3. Let |r| be a new Response object, associated with a new response,
-    // Headers object, and FetchBodyStream object."
-    Response* r = new Response();
+    // Headers object, and Body object."
+    Response* r = new Response(context);
+    r->suspendIfNeeded();
 
     // "4. Set |r|'s response's status to |init|'s status member."
     r->m_response->setStatus(responseInit.status);
 
     // "5. Set |r|'s response's status message to |init|'s statusText member."
     r->m_response->setStatusMessage(AtomicString(responseInit.statusText));
 
     // "6. If |init|'s headers member is present, run these substeps:"
     if (responseInit.headers) {
         // "1. Empty |r|'s response's header list."
@@ skipping 17 matching lines @@
         // "1. Let |stream| and |Content-Type| be the result of extracting body."
         // "2. Set |r|'s response's body to |stream|."
         // "3. If |Content-Type| is non-null and |r|'s response's header list
         // contains no header named `Content-Type`, append `Content-Type`/
         // |Content-Type| to |r|'s response's header list."
         r->m_response->setBlobDataHandle(body->blobDataHandle());
         if (!body->type().isNull() && !r->m_response->headerList()->has("Content-Type"))
             r->m_response->headerList()->append("Content-Type", body->type());
     }
 
-    // FIXME: "8. Set |r|'s FetchBodyStream object's MIME type to the result of
-    //        extracting a MIME type from |r|'s response's header list."
+    // FIXME: "8. Set |r|'s MIME type to the result of extracting a MIME type
+    //        from |r|'s response's header list."
 
     // "9. Return |r|."
     return r;
 }
 
-Response* Response::create(FetchResponseData* response)
+Response* Response::create(ExecutionContext* context, FetchResponseData* response)
 {
-    return new Response(response);
+    Response* r = new Response(context, response);
+    r->suspendIfNeeded();
+    return r;
 }
 
-Response* Response::create(const WebServiceWorkerResponse& webResponse)
+Response* Response::create(ExecutionContext* context, const WebServiceWorkerResponse& webResponse)
 {
-    return new Response(webResponse);
+    Response* r = new Response(context, webResponse);
+    r->suspendIfNeeded();
+    return r;
 }
 
 String Response::type() const
 {
     // "The type attribute's getter must return response's type."
     switch (m_response->type()) {
     case FetchResponseData::BasicType:
         return "basic";
     case FetchResponseData::CORSType:
         return "cors";
@@ skipping 31 matching lines @@
     // "The statusText attribute's getter must return response's status message."
     return m_response->statusMessage();
 }
 
 Headers* Response::headers() const
 {
     // "The headers attribute's getter must return the associated Headers object."
     return m_headers;
 }
 
-FetchBodyStream* Response::body(ExecutionContext* context)
-{
-    if (!m_response->blobDataHandle())
-        return 0;
-    if (!m_fetchBodyStream)
-        m_fetchBodyStream = FetchBodyStream::create(context, m_response->blobDataHandle());
-    return m_fetchBodyStream;
-}
-
 void Response::populateWebServiceWorkerResponse(WebServiceWorkerResponse& response)
 {
     m_response->populateWebServiceWorkerResponse(response);
 }
 
-Response::Response()
-    : m_response(FetchResponseData::create())
+Response::Response(ExecutionContext* context)
+    : Body(context)
+    , m_response(FetchResponseData::create())
     , m_headers(Headers::create(m_response->headerList()))
 {
     m_headers->setGuard(Headers::ResponseGuard);
 }
 
-Response::Response(FetchResponseData* response)
-    : m_response(response)
+Response::Response(ExecutionContext* context, FetchResponseData* response)
+    : Body(context)
+    , m_response(response)
     , m_headers(Headers::create(m_response->headerList()))
 {
     m_headers->setGuard(Headers::ResponseGuard);
 }
 
 // FIXME: Handle response body data.
-Response::Response(const WebServiceWorkerResponse& webResponse)
-    : m_response(createFetchResponseDataFromWebResponse(webResponse))
+Response::Response(ExecutionContext* context, const WebServiceWorkerResponse& webResponse)
+    : Body(context)
+    , m_response(createFetchResponseDataFromWebResponse(webResponse))
     , m_headers(createHeadersFromWebResponse(webResponse))
 {
     m_headers->setGuard(Headers::ResponseGuard);
 }
 
+PassRefPtr<BlobDataHandle> Response::blobDataHandle()
+{
+    return m_response->blobDataHandle();
+}
+
 void Response::trace(Visitor* visitor)
 {
+    Body::trace(visitor);
     visitor->trace(m_response);
     visitor->trace(m_headers);
-    visitor->trace(m_fetchBodyStream);
 }
 
 } // namespace blink