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

Unified Diff: content/renderer/service_worker/service_worker_context_client.cc

Issue 2516353002: Introduce url_list to the Response scheme of CacheStorage. (Closed)
Patch Set: implicit conversion WebURL <-> GURL and WebVector <- vector Created 4 years 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: content/renderer/service_worker/service_worker_context_client.cc
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index f74bf10124736443b384b9317c6a103ae3e31fe8..ae67e119183a1025b95c07d6a3a0d61e9ce6657a 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -253,7 +253,7 @@ class ServiceWorkerContextClient::NavigationPreloadRequest final
DCHECK(!response_);
DCHECK(!downloaded_file);
response_ = base::MakeUnique<blink::WebServiceWorkerResponse>();
- response_->setURL(url_);
+ response_->setURLList(std::vector<blink::WebURL>({url_}));
DCHECK(response_head.headers);
response_->setStatus(response_head.headers->response_code());
response_->setStatusText(
@@ -693,22 +693,10 @@ void ServiceWorkerContextClient::respondToFetchEvent(
int fetch_event_id,
const blink::WebServiceWorkerResponse& web_response,
double event_dispatch_time) {
- ServiceWorkerHeaderMap headers;
- GetServiceWorkerHeaderMapFromWebResponse(web_response, &headers);
- ServiceWorkerHeaderList cors_exposed_header_names;
- GetCorsExposedHeaderNamesFromWebResponse(web_response,
- &cors_exposed_header_names);
- ServiceWorkerResponse response(
- web_response.url(), web_response.status(),
- web_response.statusText().utf8(), web_response.responseType(), headers,
- web_response.blobUUID().utf8(), web_response.blobSize(),
- web_response.streamURL(), web_response.error(),
- base::Time::FromInternalValue(web_response.responseTime()),
- !web_response.cacheStorageCacheName().isNull(),
- web_response.cacheStorageCacheName().utf8(), cors_exposed_header_names);
Send(new ServiceWorkerHostMsg_FetchEventResponse(
GetRoutingID(), fetch_event_id,
- SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response,
+ SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
+ GetServiceWorkerResponseFromWebResponse(web_response),
base::Time::FromDoubleT(event_dispatch_time)));
}
« no previous file with comments | « content/renderer/cache_storage/cache_storage_dispatcher.cc ('k') | content/renderer/service_worker/service_worker_type_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698