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

Unified Diff: content/browser/service_worker/service_worker_dispatcher_host.cc

Issue 2771823002: Implement updateViaCache flag and no-cache by default for main service worker scripts
Patch Set: Created 3 years, 9 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: content/browser/service_worker/service_worker_dispatcher_host.cc
diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc
index 9202ef8ef250a5c39220cf444dc600fb426d9256..5e90e7c92d48d6da0d1eaba3dc1cb6c7287b7212 100644
--- a/content/browser/service_worker/service_worker_dispatcher_host.cc
+++ b/content/browser/service_worker/service_worker_dispatcher_host.cc
@@ -298,8 +298,7 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
int thread_id,
int request_id,
int provider_id,
- const GURL& pattern,
- const GURL& script_url) {
+ const ServiceWorkerRegistrationAttributes& attrs) {
TRACE_EVENT0("ServiceWorker",
"ServiceWorkerDispatcherHost::OnRegisterServiceWorker");
ProviderStatus provider_status;
@@ -326,26 +325,27 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
break;
}
- if (!pattern.is_valid() || !script_url.is_valid()) {
+ if (!attrs.pattern.is_valid() || !attrs.script_url.is_valid()) {
bad_message::ReceivedBadMessage(this, bad_message::SWDH_REGISTER_BAD_URL);
return;
}
std::string error_message;
- if (ServiceWorkerUtils::ContainsDisallowedCharacter(pattern, script_url,
- &error_message)) {
+ if (ServiceWorkerUtils::ContainsDisallowedCharacter(
+ attrs.pattern, attrs.script_url, &error_message)) {
bad_message::ReceivedBadMessage(this, bad_message::SWDH_REGISTER_CANNOT);
return;
}
- std::vector<GURL> urls = {provider_host->document_url(), pattern, script_url};
+ std::vector<GURL> urls = {provider_host->document_url(), attrs.pattern,
+ attrs.script_url};
if (!ServiceWorkerUtils::AllOriginsMatchAndCanAccessServiceWorkers(urls)) {
bad_message::ReceivedBadMessage(this, bad_message::SWDH_REGISTER_CANNOT);
return;
}
if (!GetContentClient()->browser()->AllowServiceWorker(
- pattern, provider_host->topmost_frame_url(), resource_context_,
+ attrs.pattern, provider_host->topmost_frame_url(), resource_context_,
base::Bind(&GetWebContents, render_process_id_,
provider_host->frame_id()))) {
Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
@@ -355,18 +355,14 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
return;
}
- TRACE_EVENT_ASYNC_BEGIN2(
- "ServiceWorker", "ServiceWorkerDispatcherHost::RegisterServiceWorker",
- request_id, "Scope", pattern.spec(), "Script URL", script_url.spec());
+ TRACE_EVENT_ASYNC_BEGIN2("ServiceWorker",
+ "ServiceWorkerDispatcherHost::RegisterServiceWorker",
+ request_id, "Scope", attrs.pattern.spec(),
+ "Script URL", attrs.script_url.spec());
GetContext()->RegisterServiceWorker(
- pattern,
- script_url,
- provider_host,
- base::Bind(&ServiceWorkerDispatcherHost::RegistrationComplete,
- this,
- thread_id,
- provider_id,
- request_id));
+ attrs.pattern, attrs.script_url, attrs.use_cache, provider_host,
+ base::Bind(&ServiceWorkerDispatcherHost::RegistrationComplete, this,
+ thread_id, provider_id, request_id));
}
void ServiceWorkerDispatcherHost::OnUpdateServiceWorker(

Powered by Google App Engine
This is Rietveld 408576698