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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/modules/fetch/ResponseTest.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/Response.idl ('k') | third_party/WebKit/Source/modules/serviceworkers/RespondWithObserver.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/ResponseTest.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp b/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
index 29b4b9eb43187ac2979a23a9eb47075ffa22b42c..d8ee7eff15f0140853fe28ccc33b7fc0d929e779 100644
--- a/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
+++ b/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
@@ -70,7 +70,7 @@
TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponse)
{
OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
- Response* response = Response::create(getScriptState(), *webResponse);
+ Response* response = Response::create(getExecutionContext(), *webResponse);
ASSERT(response);
EXPECT_EQ(webResponse->url(), response->url());
EXPECT_EQ(webResponse->status(), response->status());
@@ -92,7 +92,7 @@
{
OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
webResponse->setResponseType(WebServiceWorkerResponseTypeDefault);
- Response* response = Response::create(getScriptState(), *webResponse);
+ Response* response = Response::create(getExecutionContext(), *webResponse);
Headers* responseHeaders = response->headers();
TrackExceptionState exceptionState;
@@ -106,7 +106,7 @@
{
OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
webResponse->setResponseType(WebServiceWorkerResponseTypeBasic);
- Response* response = Response::create(getScriptState(), *webResponse);
+ Response* response = Response::create(getExecutionContext(), *webResponse);
Headers* responseHeaders = response->headers();
TrackExceptionState exceptionState;
@@ -120,7 +120,7 @@
{
OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
webResponse->setResponseType(WebServiceWorkerResponseTypeCORS);
- Response* response = Response::create(getScriptState(), *webResponse);
+ Response* response = Response::create(getExecutionContext(), *webResponse);
Headers* responseHeaders = response->headers();
TrackExceptionState exceptionState;
@@ -134,7 +134,7 @@
{
OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
webResponse->setResponseType(WebServiceWorkerResponseTypeOpaque);
- Response* response = Response::create(getScriptState(), *webResponse);
+ Response* response = Response::create(getExecutionContext(), *webResponse);
Headers* responseHeaders = response->headers();
TrackExceptionState exceptionState;
@@ -144,7 +144,7 @@
EXPECT_FALSE(exceptionState.hadException());
}
-void checkResponseStream(ScriptState* scriptState, Response* response, bool checkResponseBodyStreamBuffer)
+void checkResponseStream(Response* response, bool checkResponseBodyStreamBuffer)
{
BodyStreamBuffer* originalInternal = response->internalBodyBuffer();
if (checkResponseBodyStreamBuffer) {
@@ -154,7 +154,7 @@
}
TrackExceptionState exceptionState;
- Response* clonedResponse = response->clone(scriptState, exceptionState);
+ Response* clonedResponse = response->clone(exceptionState);
EXPECT_FALSE(exceptionState.hadException());
if (!response->internalBodyBuffer())
@@ -180,72 +180,72 @@
EXPECT_CALL(*client1, didFetchDataLoadedString(String("Hello, world")));
EXPECT_CALL(*client2, didFetchDataLoadedString(String("Hello, world")));
- response->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAsString(), client1);
- clonedResponse->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAsString(), client2);
+ response->internalBodyBuffer()->startLoading(response->getExecutionContext(), FetchDataLoader::createLoaderAsString(), client1);
+ clonedResponse->internalBodyBuffer()->startLoading(response->getExecutionContext(), FetchDataLoader::createLoaderAsString(), client2);
blink::testing::runPendingTasks();
}
-BodyStreamBuffer* createHelloWorldBuffer(ScriptState* scriptState)
+BodyStreamBuffer* createHelloWorldBuffer()
{
using Command = DataConsumerHandleTestUtil::Command;
OwnPtr<DataConsumerHandleTestUtil::ReplayingHandle> src(DataConsumerHandleTestUtil::ReplayingHandle::create());
src->add(Command(Command::Data, "Hello, "));
src->add(Command(Command::Data, "world"));
src->add(Command(Command::Done));
- return new BodyStreamBuffer(scriptState, createFetchDataConsumerHandleFromWebHandle(src.release()));
+ return new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(src.release()));
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneDefault)
{
- BodyStreamBuffer* buffer = createHelloWorldBuffer(getScriptState());
- FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
- Response* response = Response::create(getExecutionContext(), fetchResponseData);
- EXPECT_EQ(response->internalBodyBuffer(), buffer);
- checkResponseStream(getScriptState(), response, true);
+ BodyStreamBuffer* buffer = createHelloWorldBuffer();
+ FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
+ fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
+ Response* response = Response::create(getExecutionContext(), fetchResponseData);
+ EXPECT_EQ(response->internalBodyBuffer(), buffer);
+ checkResponseStream(response, true);
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneBasic)
{
- BodyStreamBuffer* buffer = createHelloWorldBuffer(getScriptState());
+ BodyStreamBuffer* buffer = createHelloWorldBuffer();
FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
fetchResponseData = fetchResponseData->createBasicFilteredResponse();
Response* response = Response::create(getExecutionContext(), fetchResponseData);
EXPECT_EQ(response->internalBodyBuffer(), buffer);
- checkResponseStream(getScriptState(), response, true);
+ checkResponseStream(response, true);
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneCORS)
{
- BodyStreamBuffer* buffer = createHelloWorldBuffer(getScriptState());
+ BodyStreamBuffer* buffer = createHelloWorldBuffer();
FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
fetchResponseData = fetchResponseData->createCORSFilteredResponse();
Response* response = Response::create(getExecutionContext(), fetchResponseData);
EXPECT_EQ(response->internalBodyBuffer(), buffer);
- checkResponseStream(getScriptState(), response, true);
+ checkResponseStream(response, true);
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneOpaque)
{
- BodyStreamBuffer* buffer = createHelloWorldBuffer(getScriptState());
+ BodyStreamBuffer* buffer = createHelloWorldBuffer();
FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
fetchResponseData = fetchResponseData->createOpaqueFilteredResponse();
Response* response = Response::create(getExecutionContext(), fetchResponseData);
EXPECT_EQ(response->internalBodyBuffer(), buffer);
- checkResponseStream(getScriptState(), response, false);
+ checkResponseStream(response, false);
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneError)
{
- BodyStreamBuffer* buffer = new BodyStreamBuffer(getScriptState(), createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
- FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
- Response* response = Response::create(getExecutionContext(), fetchResponseData);
- TrackExceptionState exceptionState;
- Response* clonedResponse = response->clone(getScriptState(), exceptionState);
+ BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
+ FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
+ fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
+ Response* response = Response::create(getExecutionContext(), fetchResponseData);
+ TrackExceptionState exceptionState;
+ Response* clonedResponse = response->clone(exceptionState);
EXPECT_FALSE(exceptionState.hadException());
DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client1 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
@@ -253,8 +253,8 @@
EXPECT_CALL(*client1, didFetchDataLoadFailed());
EXPECT_CALL(*client2, didFetchDataLoadFailed());
- response->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAsString(), client1);
- clonedResponse->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAsString(), client2);
+ response->internalBodyBuffer()->startLoading(response->getExecutionContext(), FetchDataLoader::createLoaderAsString(), client1);
+ clonedResponse->internalBodyBuffer()->startLoading(response->getExecutionContext(), FetchDataLoader::createLoaderAsString(), client2);
blink::testing::runPendingTasks();
}
« no previous file with comments | « third_party/WebKit/Source/modules/fetch/Response.idl ('k') | third_party/WebKit/Source/modules/serviceworkers/RespondWithObserver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698