DevTools: Added service workers to chrome://inspect/#devices

content/browser/devtools/embedded_worker_devtools_manager.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_manager.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/devtools/ipc_devtools_agent_host.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_instance.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/devtools_target.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/worker_service.h"
 #include "ipc/ipc_listener.h"
 
 namespace content {
 
 namespace {
 
 bool SendMessageToWorker(
     const EmbeddedWorkerDevToolsManager::WorkerId& worker_id,
@@ skipping 142 matching lines @@
     if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first))
       host->AddRoute(worker_id_.second, this);
   }
 
   WorkerId worker_id_;
   bool worker_attached_;
   std::string state_;
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerDevToolsAgentHost);
 };
 
+class EmbeddedWorkerDevToolsManager::ServiceWorkerTarget
+    : public DevToolsTarget {
+ public:

[pfeldman, 2014/06/30 16:37:21]

We can't implement DevToolsTarget in content. It is defined in content to be
implemented by embedder. You should instead serialize right into JSON
preferrably in devtools_http_handler_impl.  

[vkuzkokov, 2014/07/04 16:06:47]

That would require a new interface which would mirror method by method
DevToolsTarget with 2 implementations: this one and the one that delegates to
actual DevToolsTarget. Seems useless.

[pfeldman, 2014/07/05 20:17:09]

Can we migrate to DTAH for everything instead?

+  ServiceWorkerTarget(
+      scoped_refptr<EmbeddedWorkerDevToolsAgentHost> agent_host)
+      : agent_host_(agent_host) {
+  }
+
+  virtual ~ServiceWorkerTarget() {
+  }
+
+  virtual std::string GetId() const OVERRIDE {
+    return agent_host_->GetId();
+  }
+
+  virtual std::string GetParentId() const OVERRIDE {
+    return "";
+  }
+
+  virtual std::string GetType() const OVERRIDE {
+    return "worker";
+  }
+
+  virtual std::string GetTitle() const OVERRIDE {
+    return "Service Worker";
+  }
+
+  virtual std::string GetDescription() const OVERRIDE {
+    return "Service Worker";
+  }
+
+  virtual GURL GetURL() const OVERRIDE {
+    return GURL();
+  }
+
+  virtual GURL GetFaviconURL() const OVERRIDE {
+    return GURL();
+  }
+
+  virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
+    return base::TimeTicks();
+  }
+
+  virtual bool IsAttached() const OVERRIDE {
+    return agent_host_->IsAttached();
+  }
+
+  virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
+    return agent_host_;
+  }
+
+  virtual bool Activate() const OVERRIDE {
+    return false;
+  }
+
+  virtual bool Close() const OVERRIDE {
+    return EmbeddedWorkerDevToolsManager::GetInstance()->CloseServiceWorker(
+        agent_host_->worker_id());
+  }
+
+ private:
+  scoped_refptr<EmbeddedWorkerDevToolsAgentHost> agent_host_;
+  ServiceWorkerIdentifier* worker_id_;
+};
+
 // static
 EmbeddedWorkerDevToolsManager* EmbeddedWorkerDevToolsManager::GetInstance() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return Singleton<EmbeddedWorkerDevToolsManager>::get();
 }
 
-DevToolsAgentHost* EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForWorker(
+DevToolsAgentHost*
+EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForWorker(
+    int worker_process_id,
+    int worker_route_id) {
+  return GetOrCreateAgentHost(worker_process_id, worker_route_id);
+}
+
+EmbeddedWorkerDevToolsManager::EmbeddedWorkerDevToolsAgentHost*
+EmbeddedWorkerDevToolsManager::GetOrCreateAgentHost(
     int worker_process_id,
     int worker_route_id) {
   WorkerId id(worker_process_id, worker_route_id);
 
   WorkerInfoMap::iterator it = workers_.find(id);
   if (it == workers_.end())
     return NULL;
 
   WorkerInfo* info = it->second;
   if (info->state() != WORKER_UNINSPECTED &&
@@ skipping 10 matching lines @@
 
 DevToolsAgentHost*
 EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForServiceWorker(
     const ServiceWorkerIdentifier& service_worker_id) {
   WorkerInfoMap::iterator it = FindExistingServiceWorkerInfo(service_worker_id);
   if (it == workers_.end())
     return NULL;
   return GetDevToolsAgentHostForWorker(it->first.first, it->first.second);
 }
 
+std::vector<DevToolsTarget*>
+EmbeddedWorkerDevToolsManager::GetAllServiceWorkerTargets() {
+  std::vector<DevToolsTarget*> targets;
+  for (WorkerInfoMap::iterator it = workers_.begin();
+       it != workers_.end(); ++it) {
+    ServiceWorkerIdentifier* worker_id = it->second->service_worker_id();
+    if (!worker_id)
+      continue;
+    targets.push_back(new ServiceWorkerTarget(
+        GetOrCreateAgentHost(it->first.first, it->first.second)));
+  }
+  return targets;
+}
+
 EmbeddedWorkerDevToolsManager::EmbeddedWorkerDevToolsManager()
     : debug_service_worker_on_start_(false) {
 }
 
 EmbeddedWorkerDevToolsManager::~EmbeddedWorkerDevToolsManager() {
 }
 
 bool EmbeddedWorkerDevToolsManager::SharedWorkerCreated(
     int worker_process_id,
     int worker_route_id,
@@ skipping 142 matching lines @@
 
 void EmbeddedWorkerDevToolsManager::MoveToPausedState(
     const WorkerId& id,
     const WorkerInfoMap::iterator& it) {
   DCHECK_EQ(WORKER_TERMINATED, it->second->state());
   scoped_ptr<WorkerInfo> info = workers_.take_and_erase(it);
   info->set_state(WORKER_PAUSED_FOR_REATTACH);
   workers_.set(id, info.Pass());
 }
 
+bool EmbeddedWorkerDevToolsManager::CloseServiceWorker(const WorkerId& id) {
+  return false;
+  //WorkerInfoMap::iterator it = workers_.find(id);
+  //if (it == workers_.end());

[pfeldman, 2014/06/30 16:37:21]

Cleanup.

[vkuzkokov, 2014/07/04 16:06:47]

Uncommented and finished

+  //  return false;
+  //ServiceWorkerIdentifier* service_worker = it->second->service_worker_id();
+  //if (!service_worker)
+  //  return false;
+  //ServiceWorkerVersion* version =
+  //    service_worker->service_worker_context_->GetLiveVersion(
+  //        service_worker->service_worker_version_id_);
+  //if (!version)
+  //  return false;
+  //version->StopWorker(ServiceWorkerVersion::StatusCallback());
+  //return true;
+}
+
 void EmbeddedWorkerDevToolsManager::ResetForTesting() {
   workers_.clear();
 }
 
 }  // namespace content