ServiceWorker: Mojofication of EWInstance::StopWorker

content/renderer/service_worker/embedded_worker_instance_client_impl.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/service_worker/embedded_worker_instance_client_impl.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/scoped_child_process_reference.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/renderer/service_worker/embedded_worker_devtools_agent.h"
 #include "content/renderer/service_worker/service_worker_context_client.h"
 #include "third_party/WebKit/public/web/WebEmbeddedWorker.h"
 #include "third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h"
 
 namespace content {
 
 // static
 void EmbeddedWorkerInstanceClientImpl::Create(
     EmbeddedWorkerDispatcher* dispatcher,
     mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request) {
   new EmbeddedWorkerInstanceClientImpl(dispatcher, std::move(request));
 }
 
+void EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted() {
+  DCHECK(embedded_worker_id_);

[horo, 2016/09/05 08:05:57]

DCHECK(stop_callback_);

[shimazu, 2016/09/06 08:53:59]

Done.

+  dispatcher_->UnregisterWorker(embedded_worker_id_.value());
+  embedded_worker_id_.reset();
+  stop_callback_.Run();
+  TRACE_EVENT0("ServiceWorker",
+               "EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted");
+  stop_callback_.Reset();
+}
+
 void EmbeddedWorkerInstanceClientImpl::StartWorker(
     mojom::EmbeddedWorkerStartWorkerParamsPtr params) {
   TRACE_EVENT0("ServiceWorker",
                "EmbeddedWorkerInstanceClientImpl::StartWorker");
 
+  embedded_worker_id_ = params->embedded_worker_id;
+
   std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper> wrapper(
       new EmbeddedWorkerDispatcher::WorkerWrapper(
           blink::WebEmbeddedWorker::create(
               new ServiceWorkerContextClient(
                   params->embedded_worker_id, params->service_worker_version_id,
                   params->scope, params->script_url,
-                  params->worker_devtools_agent_route_id),
+                  params->worker_devtools_agent_route_id,
+                  std::move(temporal_self_)),
               NULL),
           params->worker_devtools_agent_route_id));
 
   blink::WebEmbeddedWorkerStartData start_data;
   start_data.scriptURL = params->script_url;
   start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent());
   start_data.waitForDebuggerMode =
       params->wait_for_debugger
           ? blink::WebEmbeddedWorkerStartData::WaitForDebugger
           : blink::WebEmbeddedWorkerStartData::DontWaitForDebugger;
   start_data.v8CacheOptions = static_cast<blink::WebSettings::V8CacheOptions>(
       params->settings->v8_cache_options);
   start_data.dataSaverEnabled = params->settings->data_saver_enabled;
   start_data.pauseAfterDownloadMode =
       params->pause_after_download
           ? blink::WebEmbeddedWorkerStartData::PauseAfterDownload
           : blink::WebEmbeddedWorkerStartData::DontPauseAfterDownload;
 
   wrapper->worker()->startWorkerContext(start_data);
   wrapper_ = wrapper.get();
   dispatcher_->RegisterWorker(params->embedded_worker_id, std::move(wrapper));
 }
 
+void EmbeddedWorkerInstanceClientImpl::StopWorker(
+    const StopWorkerCallback& callback) {
+  if (stop_callback_)

[horo, 2016/09/05 08:05:57]

Is it possible to call StopWorker() twice?
If not, this should be DCHECK(!stop_callback_).

[shimazu, 2016/09/06 08:53:59]

No, is not. Changed it.

+    return;
+  DCHECK(embedded_worker_id_);
+  TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerInstanceClientImpl::StopWorker");
+  stop_callback_ = std::move(callback);
+  dispatcher_->SetStopWorkerTimer(embedded_worker_id_.value());
+  wrapper_->worker()->terminateWorkerContext();
+}
+
 EmbeddedWorkerInstanceClientImpl::EmbeddedWorkerInstanceClientImpl(
     EmbeddedWorkerDispatcher* dispatcher,
     mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request)
-    : dispatcher_(dispatcher), binding_(this, std::move(request)) {
+    : dispatcher_(dispatcher),
+      binding_(this, std::move(request)),
+      temporal_self_(std::unique_ptr<EmbeddedWorkerInstanceClientImpl>(this)) {
   binding_.set_connection_error_handler(base::Bind(
       &EmbeddedWorkerInstanceClientImpl::OnError, base::Unretained(this)));
 }
 
 EmbeddedWorkerInstanceClientImpl::~EmbeddedWorkerInstanceClientImpl() {}
 
 void EmbeddedWorkerInstanceClientImpl::OnError() {
-  // TODO(shimazu): Implement here
-  DVLOG(2) << __FUNCTION__;
+  // Removes myself if it's owned by myself
+  temporal_self_.reset();
 }
 
 }  // namespace content