| 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 87eddfcfb269f8bd0970ac2982e40362ac4132af..eb65e4e2be475a2b65c4a3f6dc2020cd8ad7bd13 100644
|
| --- a/content/browser/service_worker/service_worker_dispatcher_host.cc
|
| +++ b/content/browser/service_worker/service_worker_dispatcher_host.cc
|
| @@ -185,6 +185,8 @@ bool ServiceWorkerDispatcherHost::OnMessageReceived(
|
| OnWorkerReadyForInspection)
|
| IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerScriptLoaded,
|
| OnWorkerScriptLoaded)
|
| + IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerThreadStarted,
|
| + OnWorkerThreadStarted)
|
| IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerScriptLoadFailed,
|
| OnWorkerScriptLoadFailed)
|
| IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerScriptEvaluated,
|
| @@ -889,15 +891,26 @@ void ServiceWorkerDispatcherHost::OnWorkerReadyForInspection(
|
| registry->OnWorkerReadyForInspection(render_process_id_, embedded_worker_id);
|
| }
|
|
|
| -void ServiceWorkerDispatcherHost::OnWorkerScriptLoaded(
|
| - int embedded_worker_id,
|
| - int thread_id,
|
| - int provider_id) {
|
| +void ServiceWorkerDispatcherHost::OnWorkerScriptLoaded(int embedded_worker_id) {
|
| TRACE_EVENT0("ServiceWorker",
|
| "ServiceWorkerDispatcherHost::OnWorkerScriptLoaded");
|
| if (!GetContext())
|
| return;
|
|
|
| + EmbeddedWorkerRegistry* registry = GetContext()->embedded_worker_registry();
|
| + if (!registry->CanHandle(embedded_worker_id))
|
| + return;
|
| + registry->OnWorkerScriptLoaded(render_process_id_, embedded_worker_id);
|
| +}
|
| +
|
| +void ServiceWorkerDispatcherHost::OnWorkerThreadStarted(int embedded_worker_id,
|
| + int thread_id,
|
| + int provider_id) {
|
| + TRACE_EVENT0("ServiceWorker",
|
| + "ServiceWorkerDispatcherHost::OnWorkerThreadStarted");
|
| + if (!GetContext())
|
| + return;
|
| +
|
| ServiceWorkerProviderHost* provider_host =
|
| GetContext()->GetProviderHost(render_process_id_, provider_id);
|
| if (!provider_host) {
|
| @@ -911,8 +924,8 @@ void ServiceWorkerDispatcherHost::OnWorkerScriptLoaded(
|
| EmbeddedWorkerRegistry* registry = GetContext()->embedded_worker_registry();
|
| if (!registry->CanHandle(embedded_worker_id))
|
| return;
|
| - registry->OnWorkerScriptLoaded(
|
| - render_process_id_, thread_id, embedded_worker_id);
|
| + registry->OnWorkerThreadStarted(render_process_id_, thread_id,
|
| + embedded_worker_id);
|
| }
|
|
|
| void ServiceWorkerDispatcherHost::OnWorkerScriptLoadFailed(
|
|
|