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

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

Issue 1191293002: Don't create ServiceWorkerProviderHost for sandboxed frames without allow-same-origin flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporated kinuko's comment Created 5 years, 6 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 | « no previous file | content/child/service_worker/service_worker_network_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/service_worker_provider_host.cc
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc
index 878aa2a933cbc1861b365e5929479795d753ebab..8da162aa54b849590827d2062d54c66f54aeef25 100644
--- a/content/browser/service_worker/service_worker_provider_host.cc
+++ b/content/browser/service_worker/service_worker_provider_host.cc
@@ -85,6 +85,7 @@ ServiceWorkerProviderHost::ServiceWorkerProviderHost(
allow_association_(true) {
DCHECK_NE(ChildProcessHost::kInvalidUniqueID, render_process_id_);
DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, provider_type_);
+ DCHECK_NE(SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME, provider_type_);
if (provider_type_ == SERVICE_WORKER_PROVIDER_FOR_CONTROLLER) {
// Actual thread id is set when the service worker context gets started.
render_thread_id_ = kInvalidEmbeddedWorkerThreadId;
@@ -220,8 +221,10 @@ bool ServiceWorkerProviderHost::IsProviderForClient() const {
case SERVICE_WORKER_PROVIDER_FOR_SHARED_WORKER:
return true;
case SERVICE_WORKER_PROVIDER_FOR_CONTROLLER:
- case SERVICE_WORKER_PROVIDER_UNKNOWN:
return false;
+ case SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME:
+ case SERVICE_WORKER_PROVIDER_UNKNOWN:
+ NOTREACHED() << provider_type_;
}
NOTREACHED() << provider_type_;
return false;
@@ -237,6 +240,7 @@ blink::WebServiceWorkerClientType ServiceWorkerProviderHost::client_type()
case SERVICE_WORKER_PROVIDER_FOR_SHARED_WORKER:
return blink::WebServiceWorkerClientTypeSharedWorker;
case SERVICE_WORKER_PROVIDER_FOR_CONTROLLER:
+ case SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME:
case SERVICE_WORKER_PROVIDER_UNKNOWN:
NOTREACHED() << provider_type_;
}
« no previous file with comments | « no previous file | content/child/service_worker/service_worker_network_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698