Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(708)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp

Issue 1906403002: Revert of Make Response::body return v8-extra based stream behind flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@notify-locked-released
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp b/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
index a9e006dc21cb19d61066e5448320ea97c1772e36..9350a543c9d19dee4cd797868a3134767e65a0f5 100644
--- a/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
+++ b/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
@@ -57,14 +57,14 @@
{
OwnPtr<FetchDataConsumerHandle> handle = createFetchDataConsumerHandleFromWebHandle(createWaitingDataConsumerHandle());
FetchDataConsumerHandle* rawHandle = handle.get();
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), handle.release());
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(handle.release());
EXPECT_FALSE(buffer->hasPendingActivity());
EXPECT_FALSE(buffer->isStreamLocked());
EXPECT_FALSE(buffer->isStreamDisturbed());
EXPECT_TRUE(buffer->isStreamReadable());
- OwnPtr<FetchDataConsumerHandle> handle2 = buffer->releaseHandle();
+ OwnPtr<FetchDataConsumerHandle> handle2 = buffer->releaseHandle(getExecutionContext());
ASSERT_EQ(rawHandle, handle2.get());
EXPECT_TRUE(buffer->isStreamLocked());
@@ -78,12 +78,12 @@
data->appendText("hello", false);
auto size = data->length();
RefPtr<BlobDataHandle> blobDataHandle = BlobDataHandle::create(data.release(), size);
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), FetchBlobDataConsumerHandle::create(getExecutionContext(), blobDataHandle, new FakeLoaderFactory));
-
- EXPECT_FALSE(buffer->isStreamLocked());
- EXPECT_FALSE(buffer->isStreamDisturbed());
- EXPECT_FALSE(buffer->hasPendingActivity());
- RefPtr<BlobDataHandle> outputBlobDataHandle = buffer->drainAsBlobDataHandle(FetchDataConsumerHandle::Reader::AllowBlobWithInvalidSize);
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(FetchBlobDataConsumerHandle::create(getExecutionContext(), blobDataHandle, new FakeLoaderFactory));
+
+ EXPECT_FALSE(buffer->isStreamLocked());
+ EXPECT_FALSE(buffer->isStreamDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
+ RefPtr<BlobDataHandle> outputBlobDataHandle = buffer->drainAsBlobDataHandle(getExecutionContext(), FetchDataConsumerHandle::Reader::AllowBlobWithInvalidSize);
EXPECT_TRUE(buffer->isStreamLocked());
EXPECT_TRUE(buffer->isStreamDisturbed());
@@ -95,13 +95,13 @@
{
// This handle is not drainable.
OwnPtr<FetchDataConsumerHandle> handle = createFetchDataConsumerHandleFromWebHandle(createWaitingDataConsumerHandle());
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), handle.release());
-
- EXPECT_FALSE(buffer->isStreamLocked());
- EXPECT_FALSE(buffer->isStreamDisturbed());
- EXPECT_FALSE(buffer->hasPendingActivity());
-
- EXPECT_FALSE(buffer->drainAsBlobDataHandle(FetchDataConsumerHandle::Reader::AllowBlobWithInvalidSize));
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(handle.release());
+
+ EXPECT_FALSE(buffer->isStreamLocked());
+ EXPECT_FALSE(buffer->isStreamDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
+
+ EXPECT_FALSE(buffer->drainAsBlobDataHandle(getExecutionContext(), FetchDataConsumerHandle::Reader::AllowBlobWithInvalidSize));
EXPECT_FALSE(buffer->isStreamLocked());
EXPECT_FALSE(buffer->isStreamDisturbed());
@@ -115,12 +115,12 @@
data->append("name2", "value2");
RefPtr<EncodedFormData> inputFormData = data->encodeMultiPartFormData();
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), FetchFormDataConsumerHandle::create(getExecutionContext(), inputFormData));
-
- EXPECT_FALSE(buffer->isStreamLocked());
- EXPECT_FALSE(buffer->isStreamDisturbed());
- EXPECT_FALSE(buffer->hasPendingActivity());
- RefPtr<EncodedFormData> outputFormData = buffer->drainAsFormData();
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(FetchFormDataConsumerHandle::create(getExecutionContext(), inputFormData));
+
+ EXPECT_FALSE(buffer->isStreamLocked());
+ EXPECT_FALSE(buffer->isStreamDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
+ RefPtr<EncodedFormData> outputFormData = buffer->drainAsFormData(getExecutionContext());
EXPECT_TRUE(buffer->isStreamLocked());
EXPECT_TRUE(buffer->isStreamDisturbed());
@@ -132,13 +132,13 @@
{
// This handle is not drainable.
OwnPtr<FetchDataConsumerHandle> handle = createFetchDataConsumerHandleFromWebHandle(createWaitingDataConsumerHandle());
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), handle.release());
-
- EXPECT_FALSE(buffer->isStreamLocked());
- EXPECT_FALSE(buffer->isStreamDisturbed());
- EXPECT_FALSE(buffer->hasPendingActivity());
-
- EXPECT_FALSE(buffer->drainAsFormData());
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(handle.release());
+
+ EXPECT_FALSE(buffer->isStreamLocked());
+ EXPECT_FALSE(buffer->isStreamDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
+
+ EXPECT_FALSE(buffer->drainAsFormData(getExecutionContext()));
EXPECT_FALSE(buffer->isStreamLocked());
EXPECT_FALSE(buffer->isStreamDisturbed());
@@ -159,8 +159,8 @@
OwnPtr<ReplayingHandle> handle = ReplayingHandle::create();
handle->add(Command(Command::Data, "hello"));
handle->add(Command(Command::Done));
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), createFetchDataConsumerHandleFromWebHandle(handle.release()));
- buffer->startLoading(FetchDataLoader::createLoaderAsArrayBuffer(), client);
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
+ buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsArrayBuffer(), client);
EXPECT_TRUE(buffer->isStreamLocked());
EXPECT_TRUE(buffer->isStreamDisturbed());
@@ -191,8 +191,8 @@
OwnPtr<ReplayingHandle> handle = ReplayingHandle::create();
handle->add(Command(Command::Data, "hello"));
handle->add(Command(Command::Done));
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), createFetchDataConsumerHandleFromWebHandle(handle.release()));
- buffer->startLoading(FetchDataLoader::createLoaderAsBlobHandle("text/plain"), client);
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
+ buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsBlobHandle("text/plain"), client);
EXPECT_TRUE(buffer->isStreamLocked());
EXPECT_TRUE(buffer->isStreamDisturbed());
@@ -221,8 +221,8 @@
OwnPtr<ReplayingHandle> handle = ReplayingHandle::create();
handle->add(Command(Command::Data, "hello"));
handle->add(Command(Command::Done));
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), createFetchDataConsumerHandleFromWebHandle(handle.release()));
- buffer->startLoading(FetchDataLoader::createLoaderAsString(), client);
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
+ buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
EXPECT_TRUE(buffer->isStreamLocked());
EXPECT_TRUE(buffer->isStreamDisturbed());
@@ -239,7 +239,7 @@
TEST_F(BodyStreamBufferTest, ReleaseClosedHandle)
{
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
EXPECT_TRUE(buffer->isStreamReadable());
testing::runPendingTasks();
@@ -248,7 +248,7 @@
EXPECT_FALSE(buffer->isStreamLocked());
EXPECT_FALSE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
- OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle();
+ OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(getExecutionContext());
EXPECT_TRUE(handle);
EXPECT_TRUE(buffer->isStreamLocked());
@@ -266,7 +266,7 @@
EXPECT_CALL(*client, didFetchDataLoadedString(String("")));
EXPECT_CALL(checkpoint, Call(2));
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
EXPECT_TRUE(buffer->isStreamReadable());
testing::runPendingTasks();
@@ -276,7 +276,7 @@
EXPECT_FALSE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
- buffer->startLoading(FetchDataLoader::createLoaderAsString(), client);
+ buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
EXPECT_TRUE(buffer->isStreamLocked());
EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
@@ -292,7 +292,7 @@
TEST_F(BodyStreamBufferTest, ReleaseErroredHandle)
{
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
EXPECT_TRUE(buffer->isStreamReadable());
testing::runPendingTasks();
@@ -301,7 +301,7 @@
EXPECT_FALSE(buffer->isStreamLocked());
EXPECT_FALSE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
- OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle();
+ OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(getExecutionContext());
EXPECT_TRUE(handle);
EXPECT_TRUE(buffer->isStreamLocked());
EXPECT_TRUE(buffer->isStreamDisturbed());
@@ -318,7 +318,7 @@
EXPECT_CALL(*client, didFetchDataLoadFailed());
EXPECT_CALL(checkpoint, Call(2));
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
EXPECT_TRUE(buffer->isStreamReadable());
testing::runPendingTasks();
@@ -327,7 +327,7 @@
EXPECT_FALSE(buffer->isStreamLocked());
EXPECT_FALSE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
- buffer->startLoading(FetchDataLoader::createLoaderAsString(), client);
+ buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
EXPECT_TRUE(buffer->isStreamLocked());
EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
@@ -354,8 +354,8 @@
OwnPtr<ReplayingHandle> handle = ReplayingHandle::create();
handle->add(Command(Command::Data, "hello"));
handle->add(Command(Command::Done));
- Persistent<BodyStreamBuffer> buffer = new BodyStreamBuffer(getScriptState(), createFetchDataConsumerHandleFromWebHandle(handle.release()));
- buffer->startLoading(FetchDataLoader::createLoaderAsString(), client);
+ Persistent<BodyStreamBuffer> buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
+ buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
ThreadHeap::collectAllGarbage();
checkpoint.Call(1);
@@ -396,7 +396,7 @@
// |reader| is adopted by |obtainReader|.
ASSERT_TRUE(reader.leakPtr());
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), handle.release());
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(handle.release());
checkpoint.Call(1);
ScriptValue reason(getScriptState(), v8String(getScriptState()->isolate(), "reason"));
buffer->cancelSource(getScriptState(), reason);
« no previous file with comments | « third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698