DevTools Support for ServiceWoker.

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 62 matching lines @@
     : public IPCDevToolsAgentHost,
       public IPC::Listener {
  public:
   explicit EmbeddedWorkerDevToolsAgentHost(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);
   }
 
+  // DevToolsAgentHost override.
+  virtual bool IsWorker() OVERRIDE { return true; }
+
   // IPCDevToolsAgentHost implementation.
   virtual void SendMessageToAgent(IPC::Message* message) OVERRIDE {
     if (worker_attached_)
       SendMessageToWorker(worker_id_, message);
     else
       delete message;
   }
   virtual void OnClientAttached() OVERRIDE {}
   virtual void OnClientDetached() OVERRIDE {}
 
@@ skipping 118 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const WorkerId id(worker_process_id, worker_route_id);
   WorkerInfoMap::iterator it = FindExistingServiceWorkerInfo(
       storage_partition_path, service_worker_scope);
   if (it == workers_.end()) {
     scoped_ptr<WorkerInfo> info(
         new WorkerInfo(storage_partition_path, service_worker_scope));
     workers_.set(id, info.Pass());
     return false;
   }
+  if (WORKER_TERMINATED != it->second->state()) {
+    // WorkerDestroyed is called when EmbeddedWorkerInstance is deleted. But in
+    // current code ServiceWorkerStorage::DeleteRegistration doesn't remove the
+    // instance. So WorkerDestroyed could not be called correctly.
+    // TODO(horo): Remove this if statement when it becomes unnecessary.
+    DLOG(ERROR) << "WorkerDestroyed has not been called correctly.";
+    WorkerDestroyed(it->first.first, it->first.second);
+    return ServiceWorkerCreated(worker_process_id,
+                                worker_route_id,
+                                storage_partition_path,
+                                service_worker_scope);
+  }
   MoveToPausedState(id, it);
   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());
@@ skipping 88 matching lines @@
   for (; it != workers_.end(); ++it) {
     if (it->second->Matches(storage_partition_path, service_worker_scope))
       break;
   }
   return it;
 }
 
 void EmbeddedWorkerDevToolsManager::MoveToPausedState(
     const WorkerId& id,
     const WorkerInfoMap::iterator& it) {
-  DCHECK_EQ(WORKER_TERMINATED, it->second->state());
+   DCHECK_EQ(WORKER_TERMINATED, it->second->state());
   scoped_ptr<WorkerInfo> info = workers_.take_and_erase(it);
   info->set_state(WORKER_PAUSED);
   workers_.set(id, info.Pass());
 }
 
 void EmbeddedWorkerDevToolsManager::ResetForTesting() {
   workers_.clear();
 }
 
 }  // namespace content