DevTools: hand over SW inspection to chrome://inspect upon request.

content/browser/devtools/protocol/service_worker_handler.cc

 // Copyright 2015 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/protocol/service_worker_handler.h"
 
 #include "base/bind.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/devtools/service_worker_devtools_agent_host.h"
@@ skipping 174 matching lines @@
   if (render_frame_host_) {
     render_frame_host_->frame_tree_node()->frame_tree()->ForEach(
         base::Bind(&CollectURLs, &urls_));
   }
 
   ServiceWorkerDevToolsAgentHost::Map old_hosts = attached_hosts_;
   ServiceWorkerDevToolsAgentHost::Map new_hosts =
       GetMatchingServiceWorkers(urls_);
 
   for (auto pair : old_hosts) {
-    if (new_hosts.find(pair.first) == new_hosts.end())
+    if (new_hosts.find(pair.first) == new_hosts.end()) {
+      pair.second->DetachClient();
       ReportWorkerTerminated(pair.second.get());
+    }
   }
 
   for (auto pair : new_hosts) {
     if (old_hosts.find(pair.first) == old_hosts.end())
       ReportWorkerCreated(pair.second.get());
   }
 }
 
 void ServiceWorkerHandler::Detached() {
   Disable();
@@ skipping 85 matching lines @@
 
   client_->DispatchMessage(
       DispatchMessageParams::Create()->
           set_worker_id(host->GetId())->
           set_message(message));
 }
 
 void ServiceWorkerHandler::AgentHostClosed(
     DevToolsAgentHost* host,
     bool replaced_with_another_client) {
-  WorkerDestroyed(static_cast<ServiceWorkerDevToolsAgentHost*>(host));
+  ReportWorkerTerminated(static_cast<ServiceWorkerDevToolsAgentHost*>(host));

[dgozman, 2015/03/20 09:42:44]

Let's remove host from |attached_hosts_| right here, and call UpdateHosts().

[pfeldman, 2015/03/20 10:05:25]

What you are suggesting is worse since we should only report and mutate
attached_hosts_ in the same method.

 }
 
 void ServiceWorkerHandler::WorkerCreated(
     ServiceWorkerDevToolsAgentHost* host) {
   auto hosts = GetMatchingServiceWorkers(urls_);
-  if (hosts.find(host->GetId()) != hosts.end())
+  if (hosts.find(host->GetId()) != hosts.end() && !host->IsAttached())
     host->PauseForDebugOnStart();
 }
 
 void ServiceWorkerHandler::WorkerReadyForInspection(
     ServiceWorkerDevToolsAgentHost* host) {
   UpdateHosts();
 }
 
 void ServiceWorkerHandler::WorkerDestroyed(
     ServiceWorkerDevToolsAgentHost* host) {
   UpdateHosts();
 }
 
 void ServiceWorkerHandler::ReportWorkerCreated(
     ServiceWorkerDevToolsAgentHost* host) {
   if (host->IsAttached())
     return;
   attached_hosts_[host->GetId()] = host;
   host->AttachClient(this);
   client_->WorkerCreated(WorkerCreatedParams::Create()->
       set_worker_id(host->GetId())->
       set_url(host->GetURL().spec()));
 }
 
 void ServiceWorkerHandler::ReportWorkerTerminated(
     ServiceWorkerDevToolsAgentHost* host) {
   auto it = attached_hosts_.find(host->GetId());
   if (it == attached_hosts_.end())
     return;
-  it->second->DetachClient();
   client_->WorkerTerminated(WorkerTerminatedParams::Create()->
       set_worker_id(host->GetId()));
   attached_hosts_.erase(it);
 }
 
 }  // namespace service_worker
 }  // namespace devtools
 }  // namespace content