DevTools: Added service workers to remote debugging targets

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/devtools_manager_impl.h"
 #include "content/browser/devtools/devtools_protocol.h"
 #include "content/browser/devtools/devtools_protocol_constants.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_version.h"
 #include "content/browser/shared_worker/shared_worker_service_impl.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 
@@ skipping 39 matching lines @@
       worker_id_(worker_id) {
   if (debug_service_worker_on_start)
     state_ = WORKER_PAUSED_FOR_DEBUG_ON_START;
   WorkerCreated();
 }
 
 bool EmbeddedWorkerDevToolsAgentHost::IsWorker() const {
   return true;
 }
 
+DevToolsAgentHost::Type EmbeddedWorkerDevToolsAgentHost::GetType() {
+  return shared_worker_ ? AGENT_HOST_SHARED_WORKER
+                        : AGENT_HOST_SERVICE_WORKER;
+}
+
+std::string EmbeddedWorkerDevToolsAgentHost::GetTitle() {
+  return shared_worker_ ? base::UTF16ToUTF8(shared_worker_->name()) : "";
+}
+
 GURL EmbeddedWorkerDevToolsAgentHost::GetURL() {
   if (shared_worker_)
     return shared_worker_->url();
   if (service_worker_)
     return service_worker_->url();
   return GURL();
 }
 
+bool EmbeddedWorkerDevToolsAgentHost::Activate() {
+  return false;
+}
+
 bool EmbeddedWorkerDevToolsAgentHost::Close() {
   if (shared_worker_) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
         base::Bind(&TerminateSharedWorkerOnIO, worker_id_));
     return true;
   }
   if (service_worker_) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
         base::Bind(&TerminateServiceWorkerOnIO,
                    service_worker_->context_weak(),
@@ skipping 66 matching lines @@
 
 void EmbeddedWorkerDevToolsAgentHost::WorkerDestroyed() {
   DCHECK_NE(WORKER_TERMINATED, state_);
   if (state_ == WORKER_INSPECTED) {
     DCHECK(IsAttached());
     // Client host is debugging this worker agent host.
     std::string notification =
         DevToolsProtocol::CreateNotification(
             devtools::Worker::disconnectedFromWorker::kName, NULL)->Serialize();
     SendMessageToClient(notification);
+    HostClosed();

[dgozman, 2014/08/22 08:38:28]

This should go to a separate patch.

[vkuzkokov, 2014/08/22 11:01:48]

Done.

     DetachFromWorker();
   }
   state_ = WORKER_TERMINATED;
   Release();  // Balanced in WorkerCreated()
 }
 
 bool EmbeddedWorkerDevToolsAgentHost::Matches(
     const SharedWorkerInstance& other) {
   return shared_worker_ && shared_worker_->Matches(other);
 }
 
 bool EmbeddedWorkerDevToolsAgentHost::Matches(
     const ServiceWorkerIdentifier& other) {
   return service_worker_ && service_worker_->Matches(other);
 }
 
+bool EmbeddedWorkerDevToolsAgentHost::IsTerminated() {
+  return state_ == WORKER_TERMINATED;
+}
+
 EmbeddedWorkerDevToolsAgentHost::~EmbeddedWorkerDevToolsAgentHost() {
   DCHECK_EQ(WORKER_TERMINATED, state_);
   EmbeddedWorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData(
       worker_id_);
 }
 
 void EmbeddedWorkerDevToolsAgentHost::AttachToWorker() {
   if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first))
     host->AddRoute(worker_id_.second, this);
 }
@@ skipping 11 matching lines @@
     const std::string& message) {
   SendMessageToClient(message);
 }
 
 void EmbeddedWorkerDevToolsAgentHost::OnSaveAgentRuntimeState(
     const std::string& state) {
   saved_agent_state_ = state;
 }
 
 }  // namespace content