| Index: content/renderer/service_worker/embedded_worker_dispatcher.cc
|
| diff --git a/content/renderer/service_worker/embedded_worker_dispatcher.cc b/content/renderer/service_worker/embedded_worker_dispatcher.cc
|
| index 8b455cefb2e5f5c506b7f97c8de3bb9422beb854..193be7f2d0707d8faadef79ba19a64068e9d9173 100644
|
| --- a/content/renderer/service_worker/embedded_worker_dispatcher.cc
|
| +++ b/content/renderer/service_worker/embedded_worker_dispatcher.cc
|
| @@ -41,38 +41,11 @@ EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {}
|
|
|
| EmbeddedWorkerDispatcher::~EmbeddedWorkerDispatcher() {}
|
|
|
| -bool EmbeddedWorkerDispatcher::OnMessageReceived(
|
| - const IPC::Message& message) {
|
| - bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDispatcher, message)
|
| - IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StopWorker, OnStopWorker)
|
| - IPC_MESSAGE_UNHANDLED(handled = false)
|
| - IPC_END_MESSAGE_MAP()
|
| - return handled;
|
| -}
|
| -
|
| void EmbeddedWorkerDispatcher::WorkerContextDestroyed(
|
| int embedded_worker_id) {
|
| - RenderThreadImpl::current()->thread_safe_sender()->Send(
|
| - new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id));
|
| UnregisterWorker(embedded_worker_id);
|
| }
|
|
|
| -void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
|
| - TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerDispatcher::OnStopWorker");
|
| - WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
|
| - // OnStopWorker is possible to be called twice.
|
| - if (!wrapper) {
|
| - LOG(WARNING) << "Got OnStopWorker for nonexistent worker";
|
| - return;
|
| - }
|
| - // This should eventually call WorkerContextDestroyed. (We may need to post
|
| - // a delayed task to forcibly abort the worker context if we find it
|
| - // necessary)
|
| - stop_worker_times_[embedded_worker_id] = base::TimeTicks::Now();
|
| - wrapper->worker()->terminateWorkerContext();
|
| -}
|
| -
|
| std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper>
|
| EmbeddedWorkerDispatcher::StartWorkerContext(
|
| const EmbeddedWorkerStartParams& params,
|
|
|