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

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

Issue 617003003: Make WebServiceWorkerResponse support ResponseType (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addresses comments from PS4 and fixes some cache tests 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
Index: Source/modules/serviceworkers/FetchResponseData.cpp
diff --git a/Source/modules/serviceworkers/FetchResponseData.cpp b/Source/modules/serviceworkers/FetchResponseData.cpp
index df4cc1e09bb44cefc8b9b40f72064db463c8a439..be4e49e47f4e57f76916c3c6a80edb9ae5a90d25 100644
--- a/Source/modules/serviceworkers/FetchResponseData.cpp
+++ b/Source/modules/serviceworkers/FetchResponseData.cpp
@@ -11,6 +11,32 @@
namespace blink {
+namespace {
+ WebServiceWorkerResponse::ResponseType fetchTypeToWebType(FetchResponseData::Type fetchType)
horo 2014/10/01 01:38:11 + 1 line
horo 2014/10/01 01:38:11 No need to indent.
jkarlin 2014/10/01 11:26:57 Done.
jkarlin 2014/10/01 11:26:57 Done.
+ {
+ WebServiceWorkerResponse::ResponseType webType = WebServiceWorkerResponse::DefaultType;
+ switch (fetchType) {
+ case FetchResponseData::BasicType:
+ webType = WebServiceWorkerResponse::BasicType;
+ break;
+ case FetchResponseData::CORSType:
+ webType = WebServiceWorkerResponse::CORSType;
+ break;
+ case FetchResponseData::DefaultType:
+ webType = WebServiceWorkerResponse::DefaultType;
+ break;
+ case FetchResponseData::ErrorType:
+ webType = WebServiceWorkerResponse::ErrorType;
+ break;
+ case FetchResponseData::OpaqueType:
+ webType = WebServiceWorkerResponse::OpaqueType;
+ break;
+ }
+ return webType;
+ }
+
+} // namespace
+
FetchResponseData* FetchResponseData::create()
{
// "Unless stated otherwise, a response's url is null, status is 200, status
@@ -84,11 +110,14 @@ void FetchResponseData::populateWebServiceWorkerResponse(WebServiceWorkerRespons
{
if (m_internalResponse) {
m_internalResponse->populateWebServiceWorkerResponse(response);
+ response.setResponseType(fetchTypeToWebType(m_type));
return;
}
+
response.setURL(url());
response.setStatus(status());
response.setStatusText(statusMessage());
+ response.setResponseType(fetchTypeToWebType(m_type));
for (size_t i = 0; i < headerList()->size(); ++i) {
const FetchHeaderList::Header* header = headerList()->list()[i].get();
response.appendHeader(header->first, header->second);

Powered by Google App Engine
This is Rietveld 408576698