[DevTools] Support all targets discovery in Target domain.

content/browser/devtools/protocol/target_handler.cc

 // Copyright 2016 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/target_handler.h"
 
 #include "content/browser/devtools/service_worker_devtools_agent_host.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
@@ skipping 68 matching lines @@
 
   for (const auto& it : scope_agents_map)
     AddEligibleHosts(*it.second.get(), &result);
 
   return result;
 }
 
 }  // namespace
 
 TargetHandler::TargetHandler()
-    : enabled_(false),
+    : discover_(false),
       auto_attach_(false),
       wait_for_debugger_on_start_(false),
       attach_to_frames_(false),
       render_frame_host_(nullptr) {
 }
 
 TargetHandler::~TargetHandler() {
-  Disable();
+  Detached();
 }
 
 void TargetHandler::SetRenderFrameHost(RenderFrameHostImpl* render_frame_host) {
   render_frame_host_ = render_frame_host;
   UpdateFrames();
 }
 
 void TargetHandler::SetClient(std::unique_ptr<Client> client) {
   client_.swap(client);
 }
 
 void TargetHandler::Detached() {
-  Disable();
+  SetAutoAttach(false, false);
+  SetDiscoverTargets(false);
 }
 
 void TargetHandler::UpdateServiceWorkers() {
   UpdateServiceWorkers(false);
 }
 
 void TargetHandler::UpdateFrames() {
-  if (!enabled_ || !auto_attach_ || !attach_to_frames_)
+  if (!auto_attach_ || !attach_to_frames_)
     return;
 
   HostsMap new_hosts;
   if (render_frame_host_) {
     FrameTreeNode* root = render_frame_host_->frame_tree_node();
     std::queue<FrameTreeNode*> queue;
     queue.push(root);
     while (!queue.empty()) {
       FrameTreeNode* node = queue.front();
       queue.pop();
       bool cross_process = node->current_frame_host()->IsCrossProcessSubframe();
       if (node != root && cross_process) {
         scoped_refptr<DevToolsAgentHost> new_host =
             DevToolsAgentHost::GetOrCreateFor(node->current_frame_host());
         new_hosts[new_host->GetId()] = new_host;
       } else {
         for (size_t i = 0; i < node->child_count(); ++i)
           queue.push(node->child_at(i));
       }
     }
   }
 
   // TODO(dgozman): support wait_for_debugger_on_start_.
   ReattachTargetsOfType(new_hosts, DevToolsAgentHost::kTypeFrame, false);
 }
 
 void TargetHandler::UpdateServiceWorkers(bool waiting_for_debugger) {
-  if (!enabled_ || !auto_attach_)
+  if (!auto_attach_)
     return;
 
   frame_urls_.clear();
   BrowserContext* browser_context = nullptr;
   if (render_frame_host_) {
     // TODO(dgozman): do not traverse inside cross-process subframes.
     for (FrameTreeNode* node :
          render_frame_host_->frame_tree_node()->frame_tree()->Nodes()) {
       frame_urls_.insert(node->current_url());
     }
@@ skipping 35 matching lines @@
                               ->set_title(host->GetTitle())
                               ->set_url(host->GetURL().spec())
                               ->set_type(host->GetType())));
 }
 
 void TargetHandler::TargetRemovedInternal(DevToolsAgentHost* host) {
   client_->TargetRemoved(TargetRemovedParams::Create()
       ->set_target_id(host->GetId()));
 }
 
-void TargetHandler::AttachToTargetInternal(
+bool TargetHandler::AttachToTargetInternal(
     DevToolsAgentHost* host, bool waiting_for_debugger) {
-  if (host->IsAttached())
-    return;
+  if (!host->AttachClient(this))
+    return false;
   attached_hosts_[host->GetId()] = host;
-  host->AttachClient(this);
   client_->AttachedToTarget(AttachedToTargetParams::Create()
       ->set_target_id(host->GetId())
       ->set_waiting_for_debugger(waiting_for_debugger));
+  return true;
 }
 
 void TargetHandler::DetachFromTargetInternal(DevToolsAgentHost* host) {
   auto it = attached_hosts_.find(host->GetId());
   if (it == attached_hosts_.end())
     return;
   host->DetachClient(this);
   client_->DetachedFromTarget(DetachedFromTargetParams::Create()->
       set_target_id(host->GetId()));
   attached_hosts_.erase(it);
 }
 
 // ----------------- Protocol ----------------------
 
-Response TargetHandler::Enable() {
-  if (enabled_)
+Response TargetHandler::SetDiscoverTargets(bool discover) {
+  if (discover_ == discover)
     return Response::OK();
-  enabled_ = true;
-  ServiceWorkerDevToolsManager::GetInstance()->AddObserver(this);
-  UpdateServiceWorkers();
-  UpdateFrames();
+  discover_ = discover;
+  // TODO(dgozman): observe all agent hosts here.
   return Response::OK();
 }
 
-Response TargetHandler::Disable() {
-  if (!enabled_)
-    return Response::OK();
-  enabled_ = false;
-  auto_attach_ = false;
-  wait_for_debugger_on_start_ = false;
-  ServiceWorkerDevToolsManager::GetInstance()->RemoveObserver(this);
-  for (const auto& pair : attached_hosts_)
-    pair.second->DetachClient(this);
-  attached_hosts_.clear();
-  return Response::OK();
-}
-
 Response TargetHandler::SetAutoAttach(
     bool auto_attach, bool wait_for_debugger_on_start) {
   wait_for_debugger_on_start_ = wait_for_debugger_on_start;
   if (auto_attach_ == auto_attach)
     return Response::OK();
   auto_attach_ = auto_attach;
   if (auto_attach_) {
+    ServiceWorkerDevToolsManager::GetInstance()->AddObserver(this);
     UpdateServiceWorkers();
     UpdateFrames();
+  } else {
+    ServiceWorkerDevToolsManager::GetInstance()->RemoveObserver(this);
+    HostsMap empty;
+    ReattachTargetsOfType(empty, DevToolsAgentHost::kTypeFrame, false);
+    ReattachTargetsOfType(empty, DevToolsAgentHost::kTypeServiceWorker, false);
   }
   return Response::OK();
 }
 
 Response TargetHandler::SetAttachToFrames(bool value) {
   if (attach_to_frames_ == value)
     return Response::OK();
   attach_to_frames_ = value;
   if (attach_to_frames_) {
     UpdateFrames();
   } else {
     HostsMap empty;
     ReattachTargetsOfType(empty, DevToolsAgentHost::kTypeFrame, false);
   }
   return Response::OK();
 }
 
+Response TargetHandler::AttachToTarget(const std::string& target_id,
+                                       bool* out_success) {
+  scoped_refptr<DevToolsAgentHost> agent_host(
+      DevToolsAgentHost::GetForId(target_id));
+  if (!agent_host)
+    return Response::InvalidParams("No target with such id");
+  *out_success = AttachToTargetInternal(agent_host.get(), false);
+  return Response::OK();
+}
+
+Response TargetHandler::DetachFromTarget(const std::string& target_id) {
+  auto it = attached_hosts_.find(target_id);
+  if (it == attached_hosts_.end())
+    return Response::InternalError("Not attached to the target");
+  DetachFromTargetInternal(it->second.get());
+  return Response::OK();
+}
+
 Response TargetHandler::SendMessageToTarget(
     const std::string& target_id,
     const std::string& message) {
   auto it = attached_hosts_.find(target_id);
   if (it == attached_hosts_.end())
     return Response::InternalError("Not attached to the target");
   it->second->DispatchProtocolMessage(this, message);
   return Response::OK();
 }
 
@@ skipping 32 matching lines @@
 
   client_->ReceivedMessageFromTarget(
       ReceivedMessageFromTargetParams::Create()->
           set_target_id(host->GetId())->
           set_message(message));
 }
 
 void TargetHandler::AgentHostClosed(
     DevToolsAgentHost* host,
     bool replaced_with_another_client) {
-  client_->TargetRemoved(TargetRemovedParams::Create()->
+  client_->DetachedFromTarget(DetachedFromTargetParams::Create()->
       set_target_id(host->GetId()));
   attached_hosts_.erase(host->GetId());
+  TargetRemovedInternal(host);
 }
 
 // -------- ServiceWorkerDevToolsManager::Observer ----------
 
 void TargetHandler::WorkerCreated(
     ServiceWorkerDevToolsAgentHost* host) {
   BrowserContext* browser_context = nullptr;
   if (render_frame_host_)
     browser_context = render_frame_host_->GetProcess()->GetBrowserContext();
   auto hosts = GetMatchingServiceWorkers(browser_context, frame_urls_);
@@ skipping 25 matching lines @@
 }
 
 void TargetHandler::WorkerDestroyed(
     ServiceWorkerDevToolsAgentHost* host) {
   UpdateServiceWorkers();
 }
 
 }  // namespace target
 }  // namespace devtools
 }  // namespace content