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

Unified Diff: Source/modules/serviceworkers/Response.cpp

Issue 617003003: Make WebServiceWorkerResponse support ResponseType (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Put WebServiceWorkerResponseType enum in its own file (so browser can load it) Created 6 years, 3 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 | « Source/modules/serviceworkers/Response.h ('k') | Source/modules/serviceworkers/ResponseTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/serviceworkers/Response.cpp
diff --git a/Source/modules/serviceworkers/Response.cpp b/Source/modules/serviceworkers/Response.cpp
index 7f0a608a6f5fc45debb18df001e840e92527744e..31d0558a813a88aec790d68fa4947f6c864f14ea 100644
--- a/Source/modules/serviceworkers/Response.cpp
+++ b/Source/modules/serviceworkers/Response.cpp
@@ -29,19 +29,30 @@ FetchResponseData* createFetchResponseDataFromWebResponse(const WebServiceWorker
response->setURL(webResponse.url());
response->setStatus(webResponse.status());
response->setStatusMessage(webResponse.statusText());
- return response;
-}
-Headers* createHeadersFromWebResponse(const WebServiceWorkerResponse& webResponse)
-{
- Headers* headers = Headers::create();
- TrackExceptionState exceptionState;
for (HTTPHeaderMap::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;
+ response->headerList()->append(i->key, i->value);
+ }
+
+ // 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:
+ response = response->createOpaqueFilteredResponse();
+ break;
+ case WebServiceWorkerResponseTypeDefault:
+ break;
+ case WebServiceWorkerResponseTypeError:
+ ASSERT(response->type() == FetchResponseData::ErrorType);
+ break;
}
- return headers;
+
+ return response;
}
}
@@ -149,7 +160,9 @@ Response* Response::create(ExecutionContext* context, FetchResponseData* respons
Response* Response::create(ExecutionContext* context, const WebServiceWorkerResponse& webResponse)
{
- Response* r = new Response(context, webResponse);
+ // FIXME: Handle response body data.
+ FetchResponseData* responseData = createFetchResponseDataFromWebResponse(webResponse);
+ Response* r = new Response(context, responseData);
r->suspendIfNeeded();
return r;
}
@@ -243,14 +256,6 @@ Response::Response(ExecutionContext* context, FetchResponseData* response)
m_headers->setGuard(Headers::ResponseGuard);
}
-// FIXME: Handle response body data.
-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()
{
« no previous file with comments | « Source/modules/serviceworkers/Response.h ('k') | Source/modules/serviceworkers/ResponseTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698