[Fetch API] Remove DrainingBuffer.

Source/modules/fetch/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 "modules/fetch/Response.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/fileapi/Blob.h"
 #include "core/html/DOMFormData.h"
 #include "modules/fetch/BodyStreamBuffer.h"
 #include "modules/fetch/FetchBlobDataConsumerHandle.h"
 #include "modules/fetch/ResponseInit.h"
 #include "platform/network/FormData.h"
 #include "platform/network/HTTPHeaderMap.h"
 #include "public/platform/WebServiceWorkerResponse.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 namespace {
 
 FetchResponseData* createFetchResponseDataFromWebResponse(ExecutionContext* executionContext, const WebServiceWorkerResponse& webResponse)
 {
-    FetchResponseData* response = 0;
+    FetchResponseData* response = nullptr;
     if (webResponse.status() > 0)
         response = FetchResponseData::create();
     else
         response = FetchResponseData::createNetworkErrorResponse();
 
     response->setURL(webResponse.url());
     response->setStatus(webResponse.status());
     response->setStatusMessage(webResponse.statusText());
 
     for (HTTPHeaderMap::const_iterator i = webResponse.headers().begin(), end = webResponse.headers().end(); i != end; ++i) {
         response->headerList()->append(i->key, i->value);
     }
 
-    response->replaceBodyStreamBuffer(BodyStreamBuffer::create(FetchBlobDataConsumerHandle::create(executionContext, webResponse.blobDataHandle())));
+    response->replaceBodyStreamBuffer(new BodyStreamBuffer(FetchBlobDataConsumerHandle::create(executionContext, webResponse.blobDataHandle())));
 
     // Filter the response according to |webResponse|'s ResponseType.
     switch (webResponse.responseType()) {
     case WebServiceWorkerResponseTypeBasic:
         response = response->createBasicFilteredResponse();
         break;
     case WebServiceWorkerResponseTypeCORS:
         response = response->createCORSFilteredResponse();
         break;
     case WebServiceWorkerResponseTypeOpaque:
@@ skipping 110 matching lines @@
     // "2. If |init|'s statusText member does not match the Reason-Phrase
     // token production, throw a TypeError."
     if (!isValidReasonPhrase(responseInit.statusText)) {
         exceptionState.throwTypeError("Invalid statusText");
         return 0;
     }
 
     // "3. Let |r| be a new Response object, associated with a 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 16 matching lines @@
     if (body) {
         // "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."
         // https://fetch.spec.whatwg.org/#concept-bodyinit-extract
         // Step 3, Blob:
         // "If object's type attribute is not the empty byte sequence, set
         // Content-Type to its value."
-        r->m_response->replaceBodyStreamBuffer(BodyStreamBuffer::create(FetchBlobDataConsumerHandle::create(context, body->blobDataHandle())));
-        r->refreshBody();
+        r->m_response->replaceBodyStreamBuffer(new BodyStreamBuffer(FetchBlobDataConsumerHandle::create(context, body->blobDataHandle())));
         if (!body->type().isEmpty() && !r->m_response->headerList()->has("Content-Type"))
             r->m_response->headerList()->append("Content-Type", body->type());
     }
 
     // "8. Set |r|'s MIME type to the result of extracting a MIME type
     // from |r|'s response's header list."
     r->m_response->setMIMEType(r->m_response->headerList()->extractMIMEType());
 
     // "9. Return |r|."
     return r;
 }
 
 Response* Response::create(ExecutionContext* context, FetchResponseData* response)
 {
-    Response* r = new Response(context, response);
-    r->suspendIfNeeded();
-    return r;
+    return new Response(context, response);
 }
 
 Response* Response::create(ExecutionContext* context, const WebServiceWorkerResponse& webResponse)
 {
     FetchResponseData* responseData = createFetchResponseDataFromWebResponse(context, webResponse);
-    Response* r = new Response(context, responseData);
-    r->suspendIfNeeded();
-    return r;
+    return new Response(context, responseData);
 }
 
 Response* Response::error(ExecutionContext* context)
 {
     FetchResponseData* responseData = FetchResponseData::createNetworkErrorResponse();
     Response* r = new Response(context, responseData);
     r->m_headers->setGuard(Headers::ImmutableGuard);
-    r->suspendIfNeeded();
     return r;
 }
 
 Response* Response::redirect(ExecutionContext* context, const String& url, unsigned short status, ExceptionState& exceptionState)
 {
     KURL parsedURL = context->completeURL(url);
     if (!parsedURL.isValid()) {
         exceptionState.throwTypeError("Failed to parse URL from " + url);
         return nullptr;
     }
 
     if (status != 301 && status != 302 && status != 303 && status != 307 && status != 308) {
         exceptionState.throwRangeError("Invalid status code");
         return nullptr;
     }
 
     Response* r = new Response(context);
-    r->suspendIfNeeded();
     r->m_headers->setGuard(Headers::ImmutableGuard);
     r->m_response->setStatus(status);
     r->m_response->headerList()->set("Location", parsedURL);
 
     return r;
 }
 
 String Response::type() const
 {
     // "The type attribute's getter must return response's type."
@@ skipping 50 matching lines @@
     return m_headers;
 }
 
 Response* Response::clone(ExceptionState& exceptionState)
 {
     if (bodyUsed()) {
         exceptionState.throwTypeError("Response body is already used");
         return nullptr;
     }
 
-    if (OwnPtr<DrainingBodyStreamBuffer> buffer = createDrainingStream())
-        m_response->replaceBodyStreamBuffer(buffer->leakBuffer());
-
     FetchResponseData* response = m_response->clone(executionContext());
     Headers* headers = Headers::create(response->headerList());
     headers->setGuard(m_headers->guard());
-    Response* r = new Response(executionContext(), response, headers);
-    r->suspendIfNeeded();
-
-    // Lock the old body and set |body| property to the new one.
-    lockBody();
-    refreshBody();
-
-    return r;
+    return new Response(executionContext(), response, headers);
 }
 
 bool Response::hasPendingActivity() const
 {
     if (!executionContext() || executionContext()->activeDOMObjectsAreStopped())
         return false;
-    if (m_isInternalDrained)
+    if (internalBodyBuffer()->hasPendingActivity())
         return true;
     return Body::hasPendingActivity();
 }
 
 void Response::populateWebServiceWorkerResponse(WebServiceWorkerResponse& response)
 {
     m_response->populateWebServiceWorkerResponse(response);
 }
 
 Response::Response(ExecutionContext* context)
     : Body(context)
     , m_response(FetchResponseData::create())
     , m_headers(Headers::create(m_response->headerList()))
-    , m_isInternalDrained(false)
 {
     m_headers->setGuard(Headers::ResponseGuard);
 }
 
 Response::Response(ExecutionContext* context, FetchResponseData* response)
     : Body(context)
     , m_response(response)
     , m_headers(Headers::create(m_response->headerList()))
-    , m_isInternalDrained(false)
 {
     m_headers->setGuard(Headers::ResponseGuard);
-
-    refreshBody();
 }
 
 Response::Response(ExecutionContext* context, FetchResponseData* response, Headers* headers)
-    : Body(context) , m_response(response) , m_headers(headers), m_isInternalDrained(false)
-{
-    refreshBody();
-}
+    : Body(context) , m_response(response) , m_headers(headers) {}
 
 bool Response::hasBody() const
 {
-    return m_response->internalBuffer();
-}
-
-void* Response::bufferForTest() const
-{
-    return m_response->buffer();
+    return m_response->internalBuffer()->hasBody();
 }
 
 String Response::mimeType() const
 {
     return m_response->mimeType();
 }
 
-void* Response::internalBufferForTest() const
-{
-    return m_response->internalBuffer();
-}
-
 String Response::internalMIMEType() const
 {
     return m_response->internalMIMEType();
 }
 
-PassOwnPtr<DrainingBodyStreamBuffer> Response::createInternalDrainingStream()
-{
-    if (BodyStreamBuffer* buffer = m_response->internalBuffer()) {
-        if (buffer == m_response->buffer())
-            return createDrainingStream();
-        m_isInternalDrained = true;
-        return DrainingBodyStreamBuffer::create(buffer, this);
-    }
-    return nullptr;
-}
-
-void Response::didFetchDataLoadFinishedFromDrainingStream()
-{
-    ASSERT(m_isInternalDrained);
-    m_isInternalDrained = false;
-}
-
-void Response::refreshBody()
-{
-    setBody(m_response->buffer());
-}
-
 DEFINE_TRACE(Response)
 {
     Body::trace(visitor);
     visitor->trace(m_response);
     visitor->trace(m_headers);
 }
 
 } // namespace blink