ServiceWorker: Stop don't send a message before connection established

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) {
   // This won't be leaked because the lifetime will be managed internally.
   new EmbeddedWorkerInstanceClientImpl(dispatcher, std::move(request));
 }
 
 void EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted() {
   DCHECK(embedded_worker_id_);
-  DCHECK(stop_callback_);
+  DCHECK(!stop_callbacks_.empty());
   dispatcher_->UnregisterWorker(embedded_worker_id_.value());
   embedded_worker_id_.reset();
-  stop_callback_.Run();
+  std::vector<StopWorkerCallback> callbacks;
+  stop_callbacks_.swap(callbacks);
+  for (auto& callback : callbacks)
+    callback.Run();
+  DCHECK(stop_callbacks_.empty());
   TRACE_EVENT0("ServiceWorker",
                "EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted");
-  stop_callback_.Reset();
   wrapper_ = nullptr;
 }
 
 void EmbeddedWorkerInstanceClientImpl::StartWorker(
     const EmbeddedWorkerStartParams& params,
     mojom::ServiceWorkerEventDispatcherRequest dispatcher_request) {
   DCHECK(ChildThreadImpl::current());
   DCHECK(!wrapper_);
+  DCHECK(!embedded_worker_id_);
   TRACE_EVENT0("ServiceWorker",
                "EmbeddedWorkerInstanceClientImpl::StartWorker");
   embedded_worker_id_ = params.embedded_worker_id;
 
   std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper> wrapper =
       dispatcher_->StartWorkerContext(
           params,
           base::MakeUnique<ServiceWorkerContextClient>(
               params.embedded_worker_id, params.service_worker_version_id,
               params.scope, params.script_url,
               params.worker_devtools_agent_route_id,
               std::move(dispatcher_request), std::move(temporal_self_)));
   wrapper_ = wrapper.get();
   dispatcher_->RegisterWorker(params.embedded_worker_id, std::move(wrapper));
 }
 
 void EmbeddedWorkerInstanceClientImpl::StopWorker(
     const StopWorkerCallback& callback) {
   DCHECK(ChildThreadImpl::current());
+  // StopWorker is possible to be called before StartWorker().

[falken, 2016/12/20 04:41:31]

Is this still possible?

[shimazu, 2016/12/20 07:55:01]

No. This patch actually fixes this case. Updated.

+  if (!wrapper_) {
+    callback.Run();
+    return;
+  }
+  // StopWorker is possible to be called twice.

[falken, 2016/12/20 04:41:31]

Can the comment expand on how?

[shimazu, 2016/12/20 07:55:01]

This also shouldn't happen. Fixed on the browser side.

+  if (!stop_callbacks_.empty()) {
+    stop_callbacks_.push_back(std::move(callback));
+    return;
+  }
+  TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerInstanceClientImpl::StopWorker");
+  stop_callbacks_.push_back(std::move(callback));
   DCHECK(embedded_worker_id_);
-  // StopWorker is possible to be called twice or before StartWorker().
-  if (stop_callback_ || !wrapper_)
-    return;
-  TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerInstanceClientImpl::StopWorker");
-  stop_callback_ = std::move(callback);
   dispatcher_->RecordStopWorkerTimer(embedded_worker_id_.value());
   wrapper_->worker()->terminateWorkerContext();
 }
 
 EmbeddedWorkerInstanceClientImpl::EmbeddedWorkerInstanceClientImpl(
     EmbeddedWorkerDispatcher* dispatcher,
     mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request)
     : dispatcher_(dispatcher),
       binding_(this, std::move(request)),
       temporal_self_(std::unique_ptr<EmbeddedWorkerInstanceClientImpl>(this)),
       wrapper_(nullptr) {
   binding_.set_connection_error_handler(base::Bind(
       &EmbeddedWorkerInstanceClientImpl::OnError, base::Unretained(this)));
 }
 
 EmbeddedWorkerInstanceClientImpl::~EmbeddedWorkerInstanceClientImpl() {}
 
 void EmbeddedWorkerInstanceClientImpl::OnError() {
   // Removes myself if it's owned by myself.
   temporal_self_.reset();
 }
 
 }  // namespace content