Change BodyStreamBuffer to be FetchDataConsumerHandle-based and enable backpressure in Fetch API

Source/modules/fetch/ResponseTest.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/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
 #include "core/frame/Frame.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/fetch/BodyStreamBuffer.h"
+#include "modules/fetch/DataConsumerHandleTestUtil.h"
+#include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/FetchResponseData.h"
 #include "platform/blob/BlobData.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/WebServiceWorkerResponse.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 namespace {
 
-const char kTestData[] = "Here is sample text for the blob.";
-
-class MockCanceller : public BodyStreamBuffer::Canceller {
-public:
-    MockCanceller() : m_counter(0) { }
-    void cancel() override { ++m_counter; }
-    int counter() const { return m_counter; }
-
-private:
-    int m_counter;
-};
-
 PassOwnPtr<WebServiceWorkerResponse> createTestWebServiceWorkerResponse()
 {
     const KURL url(ParsedURLString, "http://www.webresponse.com/");
     const unsigned short status = 200;
     const String statusText = "the best status text";
     struct {
         const char* key;
         const char* value;
     } headers[] = { { "cache-control", "no-cache" }, { "set-cookie", "foop" }, { "foo", "bar" }, { 0, 0 } };
 
     OwnPtr<WebServiceWorkerResponse> webResponse = adoptPtr(new WebServiceWorkerResponse());
     webResponse->setURL(url);
     webResponse->setStatus(status);
     webResponse->setStatusText(statusText);
     webResponse->setResponseType(WebServiceWorkerResponseTypeDefault);
     for (int i = 0; headers[i].key; ++i)
         webResponse->setHeader(WebString::fromUTF8(headers[i].key), WebString::fromUTF8(headers[i].value));
     return webResponse.release();
 }
 
-class BlobHandleCreatorClient final : public BodyStreamBuffer::BlobHandleCreatorClient {
-public:
-    BlobHandleCreatorClient()
-    {
-    }
-    ~BlobHandleCreatorClient() override { }
-    DEFINE_INLINE_VIRTUAL_TRACE()
-    {
-        visitor->trace(m_exception);
-        BodyStreamBuffer::BlobHandleCreatorClient::trace(visitor);
-    }
-    void didCreateBlobHandle(PassRefPtr<BlobDataHandle> blobHandle) override
-    {
-        m_blobHandle = blobHandle;
-    }
-    void didFail(DOMException* exception) override
-    {
-        m_exception = exception;
-    }
-    PassRefPtr<BlobDataHandle> blobHandle()
-    {
-        return m_blobHandle;
-    }
-    DOMException* exception()
-    {
-        return m_exception;
-    }
-
-private:
-    RefPtr<BlobDataHandle> m_blobHandle;
-    Member<DOMException> m_exception;
-};
-
-
 class ServiceWorkerResponseTest : public ::testing::Test {
 public:
     ServiceWorkerResponseTest()
         : m_page(DummyPageHolder::create(IntSize(1, 1))) { }
 
     ScriptState* scriptState() { return ScriptState::forMainWorld(m_page->document().frame()); }
     ExecutionContext* executionContext() { return scriptState()->executionContext(); }
 
 private:
     OwnPtr<DummyPageHolder> m_page;
@@ skipping 82 matching lines @@
     Response* response = Response::create(executionContext(), *webResponse);
 
     Headers* responseHeaders = response->headers();
     TrackExceptionState exceptionState;
     EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().data());
     EXPECT_STREQ("", responseHeaders->get("foo", exceptionState).utf8().data());
     EXPECT_STREQ("", responseHeaders->get("cache-control", exceptionState).utf8().data());
     EXPECT_FALSE(exceptionState.hadException());
 }
 
-void checkResponseBlobHandle(Response* response, bool hasNonInternalBlobHandle, const unsigned long long blobSize)
-{
-    EXPECT_TRUE(response->internalBlobDataHandle());
-    EXPECT_EQ(blobSize, response->internalBlobDataHandle()->size());
-    EXPECT_FALSE(response->internalBuffer());
-    if (hasNonInternalBlobHandle) {
-        EXPECT_TRUE(response->blobDataHandle());
-        EXPECT_EQ(response->blobDataHandle(), response->internalBlobDataHandle());
-        EXPECT_EQ(blobSize, response->blobDataHandle()->size());
-    } else {
-        EXPECT_FALSE(response->blobDataHandle());
-    }
-    EXPECT_FALSE(response->buffer());
-
-    TrackExceptionState exceptionState;
-    Response* clonedResponse = response->clone(exceptionState);
-    EXPECT_FALSE(exceptionState.hadException());
-
-    EXPECT_TRUE(response->internalBlobDataHandle());
-    EXPECT_EQ(blobSize, clonedResponse->internalBlobDataHandle()->size());
-    EXPECT_EQ(response->internalBlobDataHandle(), clonedResponse->internalBlobDataHandle());
-    EXPECT_FALSE(response->internalBuffer());
-    EXPECT_FALSE(clonedResponse->internalBuffer());
-    if (hasNonInternalBlobHandle) {
-        EXPECT_EQ(response->internalBlobDataHandle(), response->blobDataHandle());
-        EXPECT_EQ(clonedResponse->internalBlobDataHandle(), clonedResponse->blobDataHandle());
-    } else {
-        EXPECT_FALSE(response->blobDataHandle());
-        EXPECT_FALSE(clonedResponse->blobDataHandle());
-    }
-    EXPECT_FALSE(response->buffer());
-    EXPECT_FALSE(clonedResponse->buffer());
-}
-
-TEST_F(ServiceWorkerResponseTest, BlobHandleCloneDefault)
-{
-    FetchResponseData* fetchResponseData = FetchResponseData::create();
-    fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
-    OwnPtr<BlobData> blobData(BlobData::create());
-    blobData->appendBytes(kTestData, sizeof(kTestData) - 1);
-    const unsigned long long size = blobData->length();
-    fetchResponseData->setBlobDataHandle(BlobDataHandle::create(blobData.release(), size));
-    checkResponseBlobHandle(Response::create(executionContext(), fetchResponseData), true, size);
-}
-
-TEST_F(ServiceWorkerResponseTest, BlobHandleCloneBasic)
-{
-    FetchResponseData* fetchResponseData = FetchResponseData::create();
-    fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
-    OwnPtr<BlobData> blobData(BlobData::create());
-    blobData->appendBytes(kTestData, sizeof(kTestData) - 1);
-    const unsigned long long size = blobData->length();
-    fetchResponseData->setBlobDataHandle(BlobDataHandle::create(blobData.release(), size));
-    fetchResponseData = fetchResponseData->createBasicFilteredResponse();
-    checkResponseBlobHandle(Response::create(executionContext(), fetchResponseData), true, size);
-}
-
-TEST_F(ServiceWorkerResponseTest, BlobHandleCloneCORS)
-{
-    FetchResponseData* fetchResponseData = FetchResponseData::create();
-    fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
-    OwnPtr<BlobData> blobData(BlobData::create());
-    blobData->appendBytes(kTestData, sizeof(kTestData) - 1);
-    const unsigned long long size = blobData->length();
-    fetchResponseData->setBlobDataHandle(BlobDataHandle::create(blobData.release(), size));
-    fetchResponseData = fetchResponseData->createCORSFilteredResponse();
-    checkResponseBlobHandle(Response::create(executionContext(), fetchResponseData), true, size);
-}
-
-TEST_F(ServiceWorkerResponseTest, BlobHandleCloneOpaque)
-{
-    FetchResponseData* fetchResponseData = FetchResponseData::create();
-    fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
-    OwnPtr<BlobData> blobData(BlobData::create());
-    blobData->appendBytes(kTestData, sizeof(kTestData) - 1);
-    const unsigned long long size = blobData->length();
-    fetchResponseData->setBlobDataHandle(BlobDataHandle::create(blobData.release(), size));
-    fetchResponseData = fetchResponseData->createOpaqueFilteredResponse();
-    checkResponseBlobHandle(Response::create(executionContext(), fetchResponseData), false, size);
-}
-
 void checkResponseStream(Response* response, bool checkResponseBodyStreamBuffer)
 {
-    BodyStreamBuffer* buffer = response->internalBuffer();
-    EXPECT_FALSE(response->internalBlobDataHandle());
-    EXPECT_FALSE(response->blobDataHandle());
+    BodyStreamBuffer2* buffer = response->internalBuffer();
     if (checkResponseBodyStreamBuffer) {
         EXPECT_EQ(response->buffer(), buffer);
     } else {
         EXPECT_FALSE(response->buffer());
     }
 
     TrackExceptionState exceptionState;
     Response* clonedResponse = response->clone(exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
-    EXPECT_FALSE(response->internalBlobDataHandle());
-    EXPECT_FALSE(response->blobDataHandle());
-    EXPECT_FALSE(clonedResponse->internalBlobDataHandle());
-    EXPECT_FALSE(clonedResponse->blobDataHandle());
 
     EXPECT_TRUE(response->internalBuffer());
     EXPECT_TRUE(clonedResponse->internalBuffer());
     EXPECT_NE(response->internalBuffer(), buffer);
     EXPECT_NE(clonedResponse->internalBuffer(), buffer);
     EXPECT_NE(response->internalBuffer(), clonedResponse->internalBuffer());
     if (checkResponseBodyStreamBuffer) {
         EXPECT_EQ(response->buffer(), response->internalBuffer());
         EXPECT_EQ(clonedResponse->buffer(), clonedResponse->internalBuffer());
     } else {
         EXPECT_FALSE(response->buffer());
         EXPECT_FALSE(clonedResponse->buffer());
     }
-    BlobHandleCreatorClient* client1 = new BlobHandleCreatorClient();
-    BlobHandleCreatorClient* client2 = new BlobHandleCreatorClient();
-    EXPECT_TRUE(response->internalBuffer()->readAllAndCreateBlobHandle(response->internalMIMEType(), client1));
-    EXPECT_TRUE(clonedResponse->internalBuffer()->readAllAndCreateBlobHandle(clonedResponse->internalMIMEType(), client2));
-    buffer->write(DOMArrayBuffer::create("foobar", 6));
-    buffer->write(DOMArrayBuffer::create("piyo", 4));
-    EXPECT_FALSE(client1->blobHandle());
-    EXPECT_FALSE(client2->blobHandle());
-    buffer->close();
-    EXPECT_TRUE(client1->blobHandle());
-    EXPECT_TRUE(client2->blobHandle());
-    EXPECT_EQ(10u, client1->blobHandle()->size());
-    EXPECT_EQ(10u, client2->blobHandle()->size());
+    DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client1 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+    FetchDataLoader* fetchDataLoader1 = FetchDataLoader::createLoaderAsString();
+    fetchDataLoader1->start(response->internalBuffer()->handle(), client1);
+
+    DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client2 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+    FetchDataLoader* fetchDataLoader2 = FetchDataLoader::createLoaderAsString();
+    fetchDataLoader2->start(clonedResponse->internalBuffer()->handle(), client2);
+
+    EXPECT_CALL(*client1, didFetchDataLoadedString(String("Hello, world")));
+    EXPECT_CALL(*client2, didFetchDataLoadedString(String("Hello, world")));
+
+    blink::testing::runPendingTasks();
+}
+
+BodyStreamBuffer2* createHelloWorldBuffer()
+{
+    using Command = DataConsumerHandleTestUtil::Command;
+    OwnPtr<DataConsumerHandleTestUtil::ReplayingHandle> src(adoptPtr(new DataConsumerHandleTestUtil::ReplayingHandle));
+    src->add(Command(Command::Data, "Hello, "));
+    src->add(Command(Command::Data, "world"));
+    src->add(Command(Command::Done));
+    return BodyStreamBuffer2::create(createFetchDataConsumerHandleFromWebHandle(src.release()));
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneDefault)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+    BodyStreamBuffer2* buffer = createHelloWorldBuffer();
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     Response* response = Response::create(executionContext(), fetchResponseData);
     EXPECT_EQ(response->internalBuffer(), buffer);
     checkResponseStream(response, true);
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneBasic)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+    BodyStreamBuffer2* buffer = createHelloWorldBuffer();
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     fetchResponseData = fetchResponseData->createBasicFilteredResponse();
     Response* response = Response::create(executionContext(), fetchResponseData);
     EXPECT_EQ(response->internalBuffer(), buffer);
     checkResponseStream(response, true);
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneCORS)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+    BodyStreamBuffer2* buffer = createHelloWorldBuffer();
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     fetchResponseData = fetchResponseData->createCORSFilteredResponse();
     Response* response = Response::create(executionContext(), fetchResponseData);
     EXPECT_EQ(response->internalBuffer(), buffer);
     checkResponseStream(response, true);
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneOpaque)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+    BodyStreamBuffer2* buffer = createHelloWorldBuffer();
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     fetchResponseData = fetchResponseData->createOpaqueFilteredResponse();
     Response* response = Response::create(executionContext(), fetchResponseData);
     EXPECT_EQ(response->internalBuffer(), buffer);
     checkResponseStream(response, false);
 }
 
 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneError)
 {
-    BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+    BodyStreamBuffer2* buffer = BodyStreamBuffer2::create(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
     FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
     fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
     Response* response = Response::create(executionContext(), fetchResponseData);
     TrackExceptionState exceptionState;
     Response* clonedResponse = response->clone(exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
-    BlobHandleCreatorClient* client1 = new BlobHandleCreatorClient();
-    BlobHandleCreatorClient* client2 = new BlobHandleCreatorClient();
-    EXPECT_TRUE(response->internalBuffer()->readAllAndCreateBlobHandle(response->internalMIMEType(), client1));
-    EXPECT_TRUE(clonedResponse->internalBuffer()->readAllAndCreateBlobHandle(clonedResponse->internalMIMEType(), client2));
-    buffer->write(DOMArrayBuffer::create("foobar", 6));
-    buffer->write(DOMArrayBuffer::create("piyo", 4));
-    EXPECT_FALSE(client1->blobHandle());
-    EXPECT_FALSE(client2->blobHandle());
-    buffer->error(DOMException::create(NetworkError, "Error Message"));
-    EXPECT_EQ("NetworkError", client1->exception()->name());
-    EXPECT_EQ("Error Message", client1->exception()->message());
-    EXPECT_EQ("NetworkError", client2->exception()->name());
-    EXPECT_EQ("Error Message", client2->exception()->message());
-}
 
-TEST_F(ServiceWorkerResponseTest, CloneAndCancel)
-{
-    auto canceller = new MockCanceller;
-    BodyStreamBuffer* buffer = new BodyStreamBuffer(canceller);
-    FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
-    fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
-    Response* response = Response::create(executionContext(), fetchResponseData);
-    TrackExceptionState exceptionState;
-    Response* clonedResponse = response->clone(exceptionState);
+    DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client1 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+    FetchDataLoader* fetchDataLoader1 = FetchDataLoader::createLoaderAsString();
+    fetchDataLoader1->start(response->internalBuffer()->handle(), client1);
 
-    EXPECT_EQ(0, canceller->counter());
-    response->bufferForTest()->cancel();
-    EXPECT_EQ(0, canceller->counter());
-    clonedResponse->bufferForTest()->cancel();
-    EXPECT_EQ(1, canceller->counter());
+    DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client2 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+    FetchDataLoader* fetchDataLoader2 = FetchDataLoader::createLoaderAsString();
+    fetchDataLoader2->start(clonedResponse->internalBuffer()->handle(), client2);
+
+    EXPECT_CALL(*client1, didFetchDataLoadFailed());
+    EXPECT_CALL(*client2, didFetchDataLoadFailed());
+
+    blink::testing::runPendingTasks();
 }
 
 } // namespace
 } // namespace blink