Chromium Code Reviews| Index: content/browser/service_worker/service_worker_context_wrapper.cc |
| diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc |
| index fbb00d4fc0fd42a3bd650f6ce2cb7cc28cbcfdd0..0a7d2bb381f9a9734acb911f5c8a39825adca73e 100644 |
| --- a/content/browser/service_worker/service_worker_context_wrapper.cc |
| +++ b/content/browser/service_worker/service_worker_context_wrapper.cc |
| @@ -82,6 +82,38 @@ void SkipWaitingWorkerOnIO( |
| registration->ActivateWaitingVersionWhenReady(); |
| } |
| +void OnServiceWorkerStartedForGetWorkerInfo( |
| + scoped_refptr<ServiceWorkerRegistration> service_worker_registration, |
| + base::OnceCallback<void(int, int)> info_callback) { |
|
Devlin
2017/06/16 02:34:42
nit: ServiceWorkerContext::GetWorkerInfoCallback?
lazyboy
2017/06/16 18:48:04
Done.
|
| + EmbeddedWorkerInstance* instance = |
| + service_worker_registration->active_version()->embedded_worker(); |
| + std::move(info_callback).Run(instance->process_id(), instance->thread_id()); |
| +} |
| + |
| +void OnServiceWorkerErrorForGetWorkerInfo(base::OnceClosure error_callback, |
| + ServiceWorkerStatusCode code) { |
| + std::move(error_callback).Run(); |
| +} |
| + |
| +void FoundReadyRegistrationForGetWorkerInfo( |
| + ServiceWorkerContextWrapper::GetWorkerInfoCallback info_callback, |
| + base::OnceClosure failure_callback, |
| + ServiceWorkerStatusCode service_worker_status, |
| + scoped_refptr<ServiceWorkerRegistration> service_worker_registration) { |
| + DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| + if (service_worker_status == SERVICE_WORKER_OK) { |
| + DCHECK(service_worker_registration->active_version()); |
| + service_worker_registration->active_version()->RunAfterStartWorker( |
| + ServiceWorkerMetrics::EventType::EXTERNAL_REQUEST, |
| + base::Bind(&OnServiceWorkerStartedForGetWorkerInfo, |
| + service_worker_registration, base::Passed(&info_callback)), |
| + base::Bind(&OnServiceWorkerErrorForGetWorkerInfo, |
| + base::Passed(&failure_callback))); |
| + } else { |
| + std::move(failure_callback).Run(); |
| + } |
| +} |
| + |
| } // namespace |
| void ServiceWorkerContext::AddExcludedHeadersForFetchEvent( |
| @@ -841,6 +873,17 @@ bool ServiceWorkerContextWrapper::FinishedExternalRequest( |
| return version->FinishExternalRequest(request_uuid); |
| } |
| +void ServiceWorkerContextWrapper::GetWorkerInfoAfterStartWorker( |
| + const GURL& origin, |
| + GetWorkerInfoCallback info_callback, |
| + base::OnceClosure failure_callback) { |
| + DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| + FindReadyRegistrationForPattern( |
| + origin, base::Bind(&FoundReadyRegistrationForGetWorkerInfo, |
| + base::Passed(&info_callback), |
| + base::Passed(&failure_callback))); |
| +} |
| + |
| void ServiceWorkerContextWrapper::DidDeleteAndStartOver( |
| ServiceWorkerStatusCode status) { |
| DCHECK_CURRENTLY_ON(BrowserThread::IO); |