Keep alive ServiceWorkers when devtools is attached

content/browser/devtools/embedded_worker_devtools_agent_host.cc

 // Copyright 2014 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/browser/devtools/embedded_worker_devtools_agent_host.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_version.h"
@@ skipping 17 matching lines @@
 
 void TerminateServiceWorkerOnIO(
     base::WeakPtr<ServiceWorkerContextCore> context_weak,
     int64 version_id) {
   if (ServiceWorkerContextCore* context = context_weak.get()) {
     if (ServiceWorkerVersion* version = context->GetLiveVersion(version_id))
       version->StopWorker(base::Bind(&StatusNoOp));
   }
 }
 
+void SetDevToolsAttachedOnIO(
+    base::WeakPtr<ServiceWorkerContextCore> context_weak,
+    int64 version_id,
+    bool attached) {
+  if (ServiceWorkerContextCore* context = context_weak.get()) {
+    if (ServiceWorkerVersion* version = context->GetLiveVersion(version_id))
+      version->SetDevToolsAttached(attached);
+  }
 }
 
+}  // namespace
+
 EmbeddedWorkerDevToolsAgentHost::EmbeddedWorkerDevToolsAgentHost(
     WorkerId worker_id,
     const SharedWorkerInstance& shared_worker)
     : shared_worker_(new SharedWorkerInstance(shared_worker)),
       state_(WORKER_UNINSPECTED),
       worker_id_(worker_id) {
   WorkerCreated();
 }
 
 EmbeddedWorkerDevToolsAgentHost::EmbeddedWorkerDevToolsAgentHost(
@@ skipping 68 matching lines @@
 void EmbeddedWorkerDevToolsAgentHost::Attach() {
   if (state_ != WORKER_INSPECTED) {
     state_ = WORKER_INSPECTED;
     AttachToWorker();
   }
   IPCDevToolsAgentHost::Attach();
 }
 
 void EmbeddedWorkerDevToolsAgentHost::OnClientAttached() {
   DevToolsAgentHostImpl::NotifyCallbacks(this, true);
+  if (service_worker_) {

[pfeldman, 2014/12/15 06:11:08]

Is this always true?

[kinuko, 2014/12/15 06:39:13]

Looks like it's not, the same code is used for SharedWorker and ServiceWorker
and this is only non-null it's initialized for ServiceWorker.

[pfeldman, 2014/12/15 07:05:04]

Oh. I was not familiar with the code and did not realize that it was used either
for service or for shared workers. Looking at the code, it seems like
introducing ServiceWorkerDevToolsAgentHost and SharedWorkerDevToolsAgentHost
that inherit from EmbeddedWorkerDevToolsAgentHost and add corresponding
specifics to it would make my confusion disappear.

+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+        base::Bind(&SetDevToolsAttachedOnIO,
+                   service_worker_->context_weak(),
+                   service_worker_->version_id(),
+                   true));
+  }
 }
 
 void EmbeddedWorkerDevToolsAgentHost::OnClientDetached() {
   if (state_ == WORKER_INSPECTED) {
     state_ = WORKER_UNINSPECTED;
     DetachFromWorker();
   } else if (state_ == WORKER_PAUSED_FOR_REATTACH) {
     state_ = WORKER_UNINSPECTED;
   }
   DevToolsAgentHostImpl::NotifyCallbacks(this, false);
+  if (service_worker_) {

[pfeldman, 2014/12/15 06:11:08]

ditto

+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+        base::Bind(&SetDevToolsAttachedOnIO,
+                   service_worker_->context_weak(),
+                   service_worker_->version_id(),
+                   false));
+  }
 }
 
 bool EmbeddedWorkerDevToolsAgentHost::OnMessageReceived(
     const IPC::Message& msg) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDevToolsAgentHost, msg)
   IPC_MESSAGE_HANDLER(DevToolsClientMsg_DispatchOnInspectorFrontend,
                       OnDispatchOnInspectorFrontend)
   IPC_MESSAGE_HANDLER(DevToolsHostMsg_SaveAgentRuntimeState,
@@ skipping 86 matching lines @@
   RenderProcessHost* rph = RenderProcessHost::FromID(worker_id_.first);
   return rph ? rph->GetBrowserContext() : nullptr;
 }
 
 void EmbeddedWorkerDevToolsAgentHost::OnSaveAgentRuntimeState(
     const std::string& state) {
   saved_agent_state_ = state;
 }
 
 }  // namespace content