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

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

Issue 443593002: ServiceWorker: Move worker candidate process knowledge to ServiceWorkerProcessManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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_context_core.cc
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc
index 5647ef974e95d7b8414403356bd292894b7ccffb..4615f8e56d07c67cf739a00e149e93c5c05497f0 100644
--- a/content/browser/service_worker/service_worker_context_core.cc
+++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -175,7 +175,6 @@ ServiceWorkerContextCore::GetProviderHostIterator() {
void ServiceWorkerContextCore::RegisterServiceWorker(
const GURL& pattern,
const GURL& script_url,
- int source_process_id,
ServiceWorkerProviderHost* provider_host,
const RegistrationCallback& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -186,13 +185,10 @@ void ServiceWorkerContextCore::RegisterServiceWorker(
return;
}
- // TODO(kinuko): Wire the provider_host so that we can tell which document
- // is calling .register.
-
job_coordinator_->Register(
pattern,
script_url,
- source_process_id,
+ provider_host,
base::Bind(&ServiceWorkerContextCore::RegistrationComplete,
AsWeakPtr(),
pattern,
@@ -408,7 +404,9 @@ void ServiceWorkerContextCore::OnReportConsoleMessage(
}
ServiceWorkerProcessManager* ServiceWorkerContextCore::process_manager() {
- return wrapper_->process_manager();
+ if (wrapper_)
+ return wrapper_->process_manager();
+ return NULL;
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698