Index: content/renderer/service_worker/service_worker_context_client.cc |
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc |
index fb363187fd6025eb3ab42b8b37c010d254d11037..780f6af040c583ce1644bd96cdf6a6479320fbb7 100644 |
--- a/content/renderer/service_worker/service_worker_context_client.cc |
+++ b/content/renderer/service_worker/service_worker_context_client.cc |
@@ -471,6 +471,7 @@ ServiceWorkerContextClient::ServiceWorkerContextClient( |
const GURL& service_worker_scope, |
const GURL& script_url, |
mojom::ServiceWorkerEventDispatcherRequest dispatcher_request, |
+ mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host, |
std::unique_ptr<EmbeddedWorkerInstanceClientImpl> embedded_worker_client) |
: embedded_worker_id_(embedded_worker_id), |
service_worker_version_id_(service_worker_version_id), |
@@ -481,6 +482,7 @@ ServiceWorkerContextClient::ServiceWorkerContextClient( |
proxy_(nullptr), |
pending_dispatcher_request_(std::move(dispatcher_request)), |
embedded_worker_client_(std::move(embedded_worker_client)) { |
+ instance_host_.Bind(std::move(instance_host)); |
TRACE_EVENT_ASYNC_BEGIN0("ServiceWorker", |
"ServiceWorkerContextClient::StartingWorkerContext", |
this); |
@@ -568,7 +570,8 @@ void ServiceWorkerContextClient::clearCachedMetadata( |
} |
void ServiceWorkerContextClient::workerReadyForInspection() { |
- Send(new EmbeddedWorkerHostMsg_WorkerReadyForInspection(embedded_worker_id_)); |
+ DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread()); |
+ instance_host_->OnReadyForInspection(); |
leonhsl(Using Gerrit)
2017/03/31 06:28:02
Some IPCs like OnScriptEvaluated are triggered on
shimazu
2017/03/31 09:56:22
Yeah and you can use ThreadSafeAssociatedInterface
leonhsl(Using Gerrit)
2017/04/04 07:14:04
Done. Thanks a lot for pointing out this class!
|
} |
void ServiceWorkerContextClient::workerContextFailedToStart() { |