Make DevTools support for the embedded SharedWorker.

content/browser/devtools/shared_worker_devtools_manager.cc

Index: content/browser/devtools/shared_worker_devtools_manager.cc
diff --git a/content/browser/devtools/worker_devtools_manager.cc b/content/browser/devtools/shared_worker_devtools_manager.cc
similarity index 11%
copy from content/browser/devtools/worker_devtools_manager.cc
copy to content/browser/devtools/shared_worker_devtools_manager.cc
index 62f77e785d6c18ff28f40158baf7aeaeb92cccdd..003c4c604c7cce3fe0875dcc79c8d658a4119e5e 100644
--- a/content/browser/devtools/worker_devtools_manager.cc
+++ b/content/browser/devtools/shared_worker_devtools_manager.cc
@@ -2,445 +2,258 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/devtools/worker_devtools_manager.h"
+#include "content/browser/devtools/shared_worker_devtools_manager.h"
 
-#include <list>
-#include <map>
-
-#include "base/bind.h"
-#include "base/lazy_instance.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/devtools/worker_devtools_message_filter.h"
-#include "content/browser/worker_host/worker_service_impl.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/child_process_data.h"
-#include "content/public/common/process_type.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/worker_service.h"
+#include "ipc/ipc_listener.h"
 
 namespace content {
 
-// Called on the UI thread.
-// static
-scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForWorker(
-    int worker_process_id,
-    int worker_route_id) {
-  return WorkerDevToolsManager::GetDevToolsAgentHostForWorker(
-      worker_process_id,
-      worker_route_id);
-}
-
 namespace {
 
-typedef std::map<WorkerDevToolsManager::WorkerId,
-                 WorkerDevToolsManager::WorkerDevToolsAgentHost*> AgentHosts;
-base::LazyInstance<AgentHosts>::Leaky g_agent_map = LAZY_INSTANCE_INITIALIZER;
-base::LazyInstance<AgentHosts>::Leaky g_orphan_map = LAZY_INSTANCE_INITIALIZER;
+bool SendMessageToWorker(const SharedWorkerDevToolsManager::WorkerId& worker_id,
+                         IPC::Message* message) {
+  RenderProcessHost* host = RenderProcessHost::FromID(worker_id.first);
+  if (!host) {
+    delete message;
+    return false;
+  }
+  message->set_routing_id(worker_id.second);
+  host->Send(message);
+  return true;
+}
 
 }  // namespace
 
-struct WorkerDevToolsManager::TerminatedInspectedWorker {
-  TerminatedInspectedWorker(WorkerId id,
-                            const GURL& url,
-                            const base::string16& name)
-      : old_worker_id(id),
-        worker_url(url),
-        worker_name(name) {}
-  WorkerId old_worker_id;
-  GURL worker_url;
-  base::string16 worker_name;
-};
-
-
-class WorkerDevToolsManager::WorkerDevToolsAgentHost
-    : public IPCDevToolsAgentHost {
+class SharedWorkerDevToolsManager::SharedWorkerDevToolsAgentHost
+    : public IPCDevToolsAgentHost,
+      public IPC::Listener {
  public:
-  explicit WorkerDevToolsAgentHost(WorkerId worker_id)
-      : has_worker_id_(false) {
-    SetWorkerId(worker_id, false);
+  SharedWorkerDevToolsAgentHost(WorkerId worker_id)
+      : worker_id_(worker_id), worker_attached_(true) {
+    AddRef();
+    if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first))
+      host->AddRoute(worker_id_.second, this);
   }
 
-  void SetWorkerId(WorkerId worker_id, bool reattach) {
-    worker_id_ = worker_id;
-    if (!has_worker_id_)
-      AddRef();  //  Balanced in ResetWorkerId.
-    has_worker_id_ = true;
-    g_agent_map.Get()[worker_id_] = this;
-
-    BrowserThread::PostTask(
-        BrowserThread::IO,
-        FROM_HERE,
-        base::Bind(
-            &ConnectToWorker,
-            worker_id.first,
-            worker_id.second));
-
-    if (reattach)
-      Reattach(state_);
+  // IPCDevToolsAgentHost implementation.
+  virtual void SendMessageToAgent(IPC::Message* message) OVERRIDE {
+    if (worker_attached_)
+      SendMessageToWorker(worker_id_, message);
   }
+  virtual void OnClientAttached() OVERRIDE {}
+  virtual void OnClientDetached() OVERRIDE {}
 
-  void ResetWorkerId() {
-    g_agent_map.Get().erase(worker_id_);
-    has_worker_id_ = false;
-    Release();  //  Balanced in SetWorkerId.
+  // IPC::Listener implementation.
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    bool handled = true;
+    IPC_BEGIN_MESSAGE_MAP(SharedWorkerDevToolsAgentHost, msg)
+    IPC_MESSAGE_HANDLER(DevToolsClientMsg_DispatchOnInspectorFrontend,
+                        OnDispatchOnInspectorFrontend)
+    IPC_MESSAGE_HANDLER(DevToolsHostMsg_SaveAgentRuntimeState,
+                        OnSaveAgentRuntimeState)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+    IPC_END_MESSAGE_MAP()
+    return handled;
   }
 
-  void SaveAgentRuntimeState(const std::string& state) {
-    state_ = state;
+  void ReattachToWorker(WorkerId worker_id) {
+    CHECK(!worker_attached_);
+    worker_attached_ = true;
+    worker_id_ = worker_id;
+    AddRef();
+    if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first))
+      host->AddRoute(worker_id_.second, this);
+    Reattach(state_);
   }
 
-  void ConnectionFailed() {
-    NotifyCloseListener();
-    // Object can be deleted here.
+  void DetachFromWorker() {
+    CHECK(worker_attached_);
+    worker_attached_ = false;
+    if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first))
+      host->RemoveRoute(worker_id_.second);
+    Release();
   }
 
- private:
-  virtual ~WorkerDevToolsAgentHost();
+  WorkerId worker_id() const { return worker_id_; }
 
-  static void ConnectToWorker(
-      int worker_process_id,
-      int worker_route_id) {
-    WorkerDevToolsManager::GetInstance()->ConnectDevToolsAgentHostToWorker(
-        worker_process_id, worker_route_id);
-  }
-
-  static void ForwardToWorkerDevToolsAgent(
-      int worker_process_id,
-      int worker_route_id,
-      IPC::Message* message) {
-    WorkerDevToolsManager::GetInstance()->ForwardToWorkerDevToolsAgent(
-        worker_process_id, worker_route_id, *message);
+ private:
+  virtual ~SharedWorkerDevToolsAgentHost() {
+    CHECK(!worker_attached_);
+    SharedWorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData(this);
   }
 
-  // IPCDevToolsAgentHost implementation.
-  virtual void SendMessageToAgent(IPC::Message* message) OVERRIDE {
-    if (!has_worker_id_) {
-      delete message;
-      return;
-    }
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(
-            &WorkerDevToolsAgentHost::ForwardToWorkerDevToolsAgent,
-            worker_id_.first,
-            worker_id_.second,
-            base::Owned(message)));
+  void OnDispatchOnInspectorFrontend(const std::string& message) {
+    DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(this,
+                                                                    message);
   }
 
-  virtual void OnClientAttached() OVERRIDE {}
-  virtual void OnClientDetached() OVERRIDE {}
+  void OnSaveAgentRuntimeState(const std::string& state) { state_ = state; }
 
-  bool has_worker_id_;
   WorkerId worker_id_;
+  bool worker_attached_;
   std::string state_;
-
-  DISALLOW_COPY_AND_ASSIGN(WorkerDevToolsAgentHost);
+  DISALLOW_COPY_AND_ASSIGN(SharedWorkerDevToolsAgentHost);
 };
 
-
-class WorkerDevToolsManager::DetachedClientHosts {
+class SharedWorkerDevToolsManager::WorkerInfo {
  public:
-  static void WorkerReloaded(WorkerId old_id, WorkerId new_id) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    AgentHosts::iterator it = g_orphan_map.Get().find(old_id);
-    if (it != g_orphan_map.Get().end()) {
-      it->second->SetWorkerId(new_id, true);
-      g_orphan_map.Get().erase(old_id);
-      return;
-    }
-    RemovePendingWorkerData(old_id);
-  }
+  WorkerInfo(const SharedWorkerInstance& instance)
+      : instance_(instance), agent_host_(NULL) {}
 
-  static void WorkerDestroyed(WorkerId id) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    AgentHosts::iterator it = g_agent_map.Get().find(id);
-    if (it == g_agent_map.Get().end()) {
-      RemovePendingWorkerData(id);
-      return;
-    }
+  const SharedWorkerInstance& instance() const { return instance_; }
 
-    WorkerDevToolsAgentHost* agent = it->second;
-    DevToolsManagerImpl* devtools_manager = DevToolsManagerImpl::GetInstance();
-    if (!agent->IsAttached()) {
-      // Agent has no client hosts -> delete it.
-      RemovePendingWorkerData(id);
-      return;
-    }
-
-    // Client host is debugging this worker agent host.
-    std::string notification = DevToolsProtocol::CreateNotification(
-        devtools::Worker::disconnectedFromWorker::kName, NULL)->Serialize();
-    devtools_manager->DispatchOnInspectorFrontend(agent, notification);
-    g_orphan_map.Get()[id] = agent;
-    agent->ResetWorkerId();
-  }
-
-  static void RemovePendingWorkerData(WorkerId id) {
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&RemoveInspectedWorkerDataOnIOThread, id));
+  SharedWorkerDevToolsAgentHost* agent_host() { return agent_host_; }
+  void set_agent_host(SharedWorkerDevToolsAgentHost* agent_host) {
+    agent_host_ = agent_host;
   }
 
  private:
-  DetachedClientHosts() {}
-  ~DetachedClientHosts() {}
-
-  static void RemoveInspectedWorkerDataOnIOThread(WorkerId id) {
-    WorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData(id);
-  }
-};
-
-struct WorkerDevToolsManager::InspectedWorker {
-  InspectedWorker(WorkerProcessHost* host, int route_id, const GURL& url,
-                  const base::string16& name)
-      : host(host),
-        route_id(route_id),
-        worker_url(url),
-        worker_name(name) {}
-  WorkerProcessHost* const host;
-  int const route_id;
-  GURL worker_url;
-  base::string16 worker_name;
+  const SharedWorkerInstance instance_;

[yurys, 2014/03/31 13:48:23]

Is it OK to store it by value?

[horo, 2014/04/01 08:34:09]

Yes it is OK.
SharedWorkerInstance has WorkerStoragePartition, but copying it is thread-safe.

+  SharedWorkerDevToolsAgentHost* agent_host_;
 };
 
 // static
-WorkerDevToolsManager* WorkerDevToolsManager::GetInstance() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return Singleton<WorkerDevToolsManager>::get();
+SharedWorkerDevToolsManager* SharedWorkerDevToolsManager::GetInstance() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  return Singleton<SharedWorkerDevToolsManager>::get();
 }
 
-// static
-DevToolsAgentHost* WorkerDevToolsManager::GetDevToolsAgentHostForWorker(
+DevToolsAgentHost* SharedWorkerDevToolsManager::GetDevToolsAgentHostForWorker(
     int worker_process_id,
     int worker_route_id) {
   WorkerId id(worker_process_id, worker_route_id);
-  AgentHosts::iterator it = g_agent_map.Get().find(id);
-  if (it == g_agent_map.Get().end())
-    return new WorkerDevToolsAgentHost(id);
-  return it->second;
-}
-
-WorkerDevToolsManager::WorkerDevToolsManager() {
-}
-
-WorkerDevToolsManager::~WorkerDevToolsManager() {
-}
-
-bool WorkerDevToolsManager::WorkerCreated(
-    WorkerProcessHost* worker,
-    const WorkerProcessHost::WorkerInstance& instance) {
-  for (TerminatedInspectedWorkers::iterator it = terminated_workers_.begin();
-       it != terminated_workers_.end(); ++it) {
-    if (instance.Matches(it->worker_url, it->worker_name,
-                         instance.partition(),
-                         instance.resource_context())) {
-      WorkerId new_worker_id(worker->GetData().id, instance.worker_route_id());
-      paused_workers_[new_worker_id] = it->old_worker_id;
-      terminated_workers_.erase(it);
-      return true;
-    }
-  }
-  return false;
-}
-
-void WorkerDevToolsManager::WorkerDestroyed(
-    WorkerProcessHost* worker,
-    int worker_route_id) {
-  InspectedWorkersList::iterator it = FindInspectedWorker(
-      worker->GetData().id,
-      worker_route_id);
-  if (it == inspected_workers_.end())
-    return;
-
-  WorkerId worker_id(worker->GetData().id, worker_route_id);
-  terminated_workers_.push_back(TerminatedInspectedWorker(
-      worker_id,
-      it->worker_url,
-      it->worker_name));
-  inspected_workers_.erase(it);
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&DetachedClientHosts::WorkerDestroyed, worker_id));
-}
-
-void WorkerDevToolsManager::WorkerContextStarted(WorkerProcessHost* process,
-                                                 int worker_route_id) {
-  WorkerId new_worker_id(process->GetData().id, worker_route_id);
-  PausedWorkers::iterator it = paused_workers_.find(new_worker_id);
-  if (it == paused_workers_.end())
-    return;
-
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &DetachedClientHosts::WorkerReloaded,
-          it->second,
-          new_worker_id));
-  paused_workers_.erase(it);
-}
 
-void WorkerDevToolsManager::RemoveInspectedWorkerData(
-    const WorkerId& id) {
-  for (TerminatedInspectedWorkers::iterator it = terminated_workers_.begin();
-       it != terminated_workers_.end(); ++it) {
-    if (it->old_worker_id == id) {
-      terminated_workers_.erase(it);
-      return;
-    }
-  }
-
-  for (PausedWorkers::iterator it = paused_workers_.begin();
-       it != paused_workers_.end(); ++it) {
-    if (it->second == id) {
-      SendResumeToWorker(it->first);
-      paused_workers_.erase(it);
-      return;
-    }
-  }
-}
-
-WorkerDevToolsManager::InspectedWorkersList::iterator
-WorkerDevToolsManager::FindInspectedWorker(
-    int host_id, int route_id) {
-  InspectedWorkersList::iterator it = inspected_workers_.begin();
-  while (it != inspected_workers_.end()) {
-    if (it->host->GetData().id == host_id && it->route_id == route_id)
-      break;
-    ++it;
-  }
-  return it;
-}
-
-static WorkerProcessHost* FindWorkerProcess(int worker_process_id) {
-  for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
-    if (iter.GetData().id == worker_process_id)
-      return *iter;
+  WorkerInfoMap::iterator inspected_it = inspected_workers_.find(id);
+  if (inspected_it != inspected_workers_.end())
+    return inspected_it->second->agent_host();
+
+  WorkerInfoMap::iterator terminated_it = terminated_workers_.find(id);
+  if (terminated_it != terminated_workers_.end())
+    return terminated_it->second->agent_host();
+
+  WorkerInfoMap::iterator paused_it = paused_workers_.find(id);
+  if (paused_it != paused_workers_.end())
+    return paused_it->second->agent_host();
+
+  WorkerInfoMap::iterator uninspected_it = uninspected_workers_.find(id);
+  if (uninspected_it != uninspected_workers_.end()) {
+    scoped_ptr<WorkerInfo> info =
+        uninspected_workers_.take_and_erase(uninspected_it);
+    SharedWorkerDevToolsAgentHost* agent_host =
+        new SharedWorkerDevToolsAgentHost(id);
+    info->set_agent_host(agent_host);
+    inspected_workers_.set(id, info.Pass());
+    return agent_host;
   }
   return NULL;
 }
 
-void WorkerDevToolsManager::ConnectDevToolsAgentHostToWorker(
-    int worker_process_id,
-    int worker_route_id) {
-  if (WorkerProcessHost* process = FindWorkerProcess(worker_process_id)) {
-    const WorkerProcessHost::Instances& instances = process->instances();
-    for (WorkerProcessHost::Instances::const_iterator i = instances.begin();
-         i != instances.end(); ++i) {
-      if (i->worker_route_id() == worker_route_id) {
-        DCHECK(FindInspectedWorker(worker_process_id, worker_route_id) ==
-               inspected_workers_.end());
-        inspected_workers_.push_back(
-            InspectedWorker(process, worker_route_id, i->url(), i->name()));
-        return;
-      }
-    }
-  }
-  NotifyConnectionFailedOnIOThread(worker_process_id, worker_route_id);
-}
+SharedWorkerDevToolsManager::SharedWorkerDevToolsManager() {}
+
+SharedWorkerDevToolsManager::~SharedWorkerDevToolsManager() {}
 
-void WorkerDevToolsManager::ForwardToDevToolsClient(
+bool SharedWorkerDevToolsManager::WorkerCreated(
     int worker_process_id,
     int worker_route_id,
-    const std::string& message) {
-  if (FindInspectedWorker(worker_process_id, worker_route_id) ==
-          inspected_workers_.end()) {
-      NOTREACHED();
-      return;
+    const SharedWorkerInstance& instance) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  const WorkerId id(worker_process_id, worker_route_id);
+  WorkerInfoMap::iterator terminated_it = FindTerminatedWorker(instance);
+  if (terminated_it == terminated_workers_.end()) {
+    scoped_ptr<WorkerInfo> info(new WorkerInfo(instance));
+    uninspected_workers_.set(id, info.Pass());
+    return false;
   }
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &ForwardToDevToolsClientOnUIThread,
-          worker_process_id,
-          worker_route_id,
-          message));
-}
-
-void WorkerDevToolsManager::SaveAgentRuntimeState(int worker_process_id,
-                                                  int worker_route_id,
-                                                  const std::string& state) {
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &SaveAgentRuntimeStateOnUIThread,
-          worker_process_id,
-          worker_route_id,
-          state));
+  scoped_ptr<WorkerInfo> info =
+      terminated_workers_.take_and_erase(terminated_it);
+  paused_workers_.set(id, info.Pass());
+  return true;
 }
 
-void WorkerDevToolsManager::ForwardToWorkerDevToolsAgent(
-    int worker_process_id,
-    int worker_route_id,
-    const IPC::Message& message) {
-  InspectedWorkersList::iterator it = FindInspectedWorker(
-      worker_process_id,
-      worker_route_id);
-  if (it == inspected_workers_.end())
+void SharedWorkerDevToolsManager::WorkerDestroyed(int worker_process_id,
+                                                  int worker_route_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  const WorkerId id(worker_process_id, worker_route_id);
+  if (uninspected_workers_.erase(id))
     return;
-  IPC::Message* msg = new IPC::Message(message);
-  msg->set_routing_id(worker_route_id);
-  it->host->Send(msg);
-}
+  WorkerInfoMap::iterator paused_it = paused_workers_.find(id);
+  if (paused_it != paused_workers_.end()) {
+    scoped_ptr<WorkerInfo> info = paused_workers_.take_and_erase(paused_it);
+    const WorkerId old_id = info->agent_host()->worker_id();
+    terminated_workers_.set(old_id, info.Pass());
+    return;
+  }
 
-// static
-void WorkerDevToolsManager::ForwardToDevToolsClientOnUIThread(
-    int worker_process_id,
-    int worker_route_id,
-    const std::string& message) {
-  AgentHosts::iterator it = g_agent_map.Get().find(WorkerId(worker_process_id,
-                                                            worker_route_id));
-  if (it == g_agent_map.Get().end())
+  WorkerInfoMap::iterator inspected_it = inspected_workers_.find(id);
+  if (inspected_it == inspected_workers_.end())
     return;
-  DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(it->second,
-                                                                  message);
-}
+  scoped_ptr<WorkerInfo> info = inspected_workers_.take_and_erase(inspected_it);
 
-// static
-void WorkerDevToolsManager::SaveAgentRuntimeStateOnUIThread(
-    int worker_process_id,
-    int worker_route_id,
-    const std::string& state) {
-  AgentHosts::iterator it = g_agent_map.Get().find(WorkerId(worker_process_id,
-                                                            worker_route_id));
-  if (it == g_agent_map.Get().end())
+  SharedWorkerDevToolsAgentHost* agent_host = info->agent_host();
+  if (!agent_host->IsAttached()) {
+    agent_host->DetachFromWorker();
     return;
-  it->second->SaveAgentRuntimeState(state);
-}
+  }
 
-// static
-void WorkerDevToolsManager::NotifyConnectionFailedOnIOThread(
-    int worker_process_id,
-    int worker_route_id) {
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &WorkerDevToolsManager::NotifyConnectionFailedOnUIThread,
-          worker_process_id,
-          worker_route_id));
+  terminated_workers_.set(id, info.Pass());
+  // Client host is debugging this worker agent host.
+  std::string notification =
+      DevToolsProtocol::CreateNotification(
+          devtools::Worker::disconnectedFromWorker::kName, NULL)->Serialize();
+  DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(agent_host,
+                                                                  notification);
+  agent_host->DetachFromWorker();
 }
 
-// static
-void WorkerDevToolsManager::NotifyConnectionFailedOnUIThread(
-    int worker_process_id,
-    int worker_route_id) {
-  AgentHosts::iterator it = g_agent_map.Get().find(WorkerId(worker_process_id,
-                                                            worker_route_id));
-  if (it != g_agent_map.Get().end())
-    it->second->ConnectionFailed();
+void SharedWorkerDevToolsManager::WorkerContextStarted(int worker_process_id,
+                                                       int worker_route_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  const WorkerId id(worker_process_id, worker_route_id);
+  WorkerInfoMap::iterator paused_it = paused_workers_.find(id);
+  if (paused_it == paused_workers_.end())
+    return;
+  scoped_ptr<WorkerInfo> info = paused_workers_.take_and_erase(paused_it);
+  info->agent_host()->ReattachToWorker(id);
+  inspected_workers_.set(id, info.Pass());
 }
 
-// static
-void WorkerDevToolsManager::SendResumeToWorker(const WorkerId& id) {
-  if (WorkerProcessHost* process = FindWorkerProcess(id.first))
-    process->Send(new DevToolsAgentMsg_ResumeWorkerContext(id.second));
+void SharedWorkerDevToolsManager::RemoveInspectedWorkerData(
+    SharedWorkerDevToolsAgentHost* agent_host) {
+  if (terminated_workers_.erase(agent_host->worker_id()))
+    return;
+
+  for (WorkerInfoMap::iterator paused_it = paused_workers_.begin();

[yurys, 2014/03/31 13:48:23]

How can the worker be in paused_workers_ map when this method is called? It
seems to me that DetachFromWorker must have been called before to release a
reference on corresponding SharedWorkerDevToolsAgentHost which happens only in
SharedWorkerDevToolsManager::WorkerDestroyed which in turn would have resulted
in moving the WorkerInfo from paused_workers_ to terminated_workers_.

[horo, 2014/04/01 08:34:09]

This could be occur when the DevToolsAgent is detached soon after the worker is
re-created and before the worker starts.


Created -> GetDevToolsAgentHost -> Register -> Started -> Destroyed ->
Re-created -> ClientHostClosing -> Destroyed

[yurys, 2014/04/01 09:01:45]

Got it, thanks for explaining.

+       paused_it != paused_workers_.end();
+       ++paused_it) {
+    if (paused_it->second->agent_host() == agent_host) {
+      SendMessageToWorker(
+          paused_it->first,
+          new DevToolsAgentMsg_ResumeWorkerContext(paused_it->first.second));
+      paused_workers_.erase(paused_it);
+      return;
+    }
+  }
 }
 
-WorkerDevToolsManager::WorkerDevToolsAgentHost::~WorkerDevToolsAgentHost() {
-  DetachedClientHosts::RemovePendingWorkerData(worker_id_);
-  g_agent_map.Get().erase(worker_id_);
-  g_orphan_map.Get().erase(worker_id_);
+SharedWorkerDevToolsManager::WorkerInfoMap::iterator
+SharedWorkerDevToolsManager::FindTerminatedWorker(
+    const SharedWorkerInstance& instance) {
+  WorkerInfoMap::iterator terminated_it = terminated_workers_.begin();
+  for (; terminated_it != terminated_workers_.end(); ++terminated_it) {
+    if (terminated_it->second->instance().Matches(instance))
+      break;
+  }
+  return terminated_it;
 }
 
 }  // namespace content