Keep alive ServiceWorkers when devtools is attached

content/browser/devtools/embedded_worker_devtools_agent_host.cc

Index: content/browser/devtools/embedded_worker_devtools_agent_host.cc
diff --git a/content/browser/devtools/embedded_worker_devtools_agent_host.cc b/content/browser/devtools/embedded_worker_devtools_agent_host.cc
index 54766f808274855688d425e103c087706946d51c..9941cd37937c3f53da7d00e8c9115cd88ddeac96 100644
--- a/content/browser/devtools/embedded_worker_devtools_agent_host.cc
+++ b/content/browser/devtools/embedded_worker_devtools_agent_host.cc
@@ -35,8 +35,18 @@ void TerminateServiceWorkerOnIO(
   }
 }
 
+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)
@@ -125,6 +135,13 @@ void EmbeddedWorkerDevToolsAgentHost::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() {
@@ -135,6 +152,13 @@ void EmbeddedWorkerDevToolsAgentHost::OnClientDetached() {
     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(