DevTools: Merge WorkerInfo into EmbeddedWorkerDevToolsAgentHost

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"
@@ skipping 72 matching lines @@
 
 EmbeddedWorkerDevToolsManager::WorkerInfo::~WorkerInfo() {
 }
 
 class EmbeddedWorkerDevToolsManager::EmbeddedWorkerDevToolsAgentHost
     : public IPCDevToolsAgentHost,
       public IPC::Listener {
  public:
   explicit EmbeddedWorkerDevToolsAgentHost(WorkerId worker_id)
       : worker_id_(worker_id), worker_attached_(false) {
-    AttachToWorker();
+    WorkerCreated();
   }
 
   // DevToolsAgentHost override.
   virtual bool IsWorker() const OVERRIDE { return true; }
 
   // IPCDevToolsAgentHost implementation.
   virtual void SendMessageToAgent(IPC::Message* message) OVERRIDE {
     if (worker_attached_)
       SendMessageToWorker(worker_id_, message);
     else
@@ skipping 28 matching lines @@
     AttachToWorker();
     Reattach(state_);
   }
 
   void DetachFromWorker() {
     if (!worker_attached_)
       return;
     worker_attached_ = false;
     if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first))
       host->RemoveRoute(worker_id_.second);
+  }
+
+  void WorkerCreated() {
+    AddRef();
+  }
+
+  void WorkerDestroyed() {
     Release();
   }
 
   WorkerId worker_id() const { return worker_id_; }
 
  private:
   virtual ~EmbeddedWorkerDevToolsAgentHost() {
     CHECK(!worker_attached_);
     EmbeddedWorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData(
         this);
   }
 
   void OnDispatchOnInspectorFrontend(const std::string& message) {
     DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(this,
                                                                     message);
   }
 
   void OnSaveAgentRuntimeState(const std::string& state) { state_ = state; }
 
   void AttachToWorker() {
     if (worker_attached_)
       return;
     worker_attached_ = true;
-    AddRef();
     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);
 };
 
@@ skipping 75 matching lines @@
   return true;
 }
 
 void EmbeddedWorkerDevToolsManager::WorkerDestroyed(int worker_process_id,
                                                     int worker_route_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const WorkerId id(worker_process_id, worker_route_id);
   WorkerInfoMap::iterator it = workers_.find(id);
   DCHECK(it != workers_.end());
   WorkerInfo* info = it->second;
+  EmbeddedWorkerDevToolsAgentHost* agent_host = info->agent_host();
   switch (info->state()) {
     case WORKER_UNINSPECTED:
     case WORKER_PAUSED_FOR_DEBUG_ON_START:
       workers_.erase(it);
       break;
     case WORKER_INSPECTED: {
-      EmbeddedWorkerDevToolsAgentHost* agent_host = info->agent_host();
       info->set_state(WORKER_TERMINATED);
-      if (!agent_host->IsAttached()) {
+      if (agent_host->IsAttached()) {
+        // 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();
-        return;
       }
-      // 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();
       break;
     }
     case WORKER_TERMINATED:
       NOTREACHED();
       break;
     case WORKER_PAUSED_FOR_REATTACH: {
       scoped_ptr<WorkerInfo> worker_info = workers_.take_and_erase(it);
       worker_info->set_state(WORKER_TERMINATED);
       const WorkerId old_id = worker_info->agent_host()->worker_id();
       workers_.set(old_id, worker_info.Pass());
       break;
     }
   }
+  if (agent_host)
+    agent_host->WorkerDestroyed();
 }
 
 void EmbeddedWorkerDevToolsManager::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 it = workers_.find(id);
   DCHECK(it != workers_.end());
   WorkerInfo* info = it->second;
   if (info->state() == WORKER_PAUSED_FOR_DEBUG_ON_START) {
@@ skipping 58 matching lines @@
   }
   return it;
 }
 
 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);
+  if (EmbeddedWorkerDevToolsAgentHost* agent_host = info->agent_host())
+    agent_host->WorkerCreated();

[dgozman, 2014/07/21 13:41:16]

Why do we call WorkerCreated from within MoveToPausedState?

[vkuzkokov, 2014/08/05 16:00:50]

MoveToPausedState is renamed to WorkerRestarted

   workers_.set(id, info.Pass());
 }
 
 void EmbeddedWorkerDevToolsManager::ResetForTesting() {
   workers_.clear();
 }
 
 }  // namespace content