[DevTools] Introduce Target.setAutoAttach.

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 69 matching lines @@
   for (const auto& it : scope_agents_map)
     AddEligibleHosts(*it.second.get(), &result);
 
   return result;
 }
 
 }  // namespace
 
 TargetHandler::TargetHandler()
     : enabled_(false),
+      auto_attach_(false),
       wait_for_debugger_on_start_(false),
       attach_to_frames_(false),
       render_frame_host_(nullptr) {
 }
 
 TargetHandler::~TargetHandler() {
   Disable();
 }
 
 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();
 }
 
 void TargetHandler::UpdateServiceWorkers() {
   UpdateServiceWorkers(false);
 }
 
 void TargetHandler::UpdateFrames() {
-  if (!enabled_ || !attach_to_frames_)
+  if (!enabled_ || !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_)
+  if (!enabled_ || !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 10 matching lines @@
 
 void TargetHandler::ReattachTargetsOfType(
     const HostsMap& new_hosts,
     const std::string& type,
     bool waiting_for_debugger) {
   HostsMap old_hosts = attached_hosts_;
   for (const auto& pair : old_hosts) {
     if (pair.second->GetType() == type &&
         new_hosts.find(pair.first) == new_hosts.end()) {
       DetachFromTargetInternal(pair.second.get());
+      TargetRemovedInternal(pair.second.get());
     }
   }
   for (const auto& pair : new_hosts) {
-    if (old_hosts.find(pair.first) == old_hosts.end())
+    if (old_hosts.find(pair.first) == old_hosts.end()) {
+      TargetCreatedInternal(pair.second.get());
       AttachToTargetInternal(pair.second.get(), waiting_for_debugger);
+    }
   }
 }
 
+void TargetHandler::TargetCreatedInternal(DevToolsAgentHost* host) {
+  client_->TargetCreated(
+      TargetCreatedParams::Create()->set_target_info(
+          TargetInfo::Create()->set_target_id(host->GetId())
+                              ->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(
     DevToolsAgentHost* host, bool waiting_for_debugger) {
   if (host->IsAttached())
     return;
   attached_hosts_[host->GetId()] = host;
   host->AttachClient(this);
-  client_->TargetCreated(TargetCreatedParams::Create()
+  client_->AttachedToTarget(AttachedToTargetParams::Create()
       ->set_target_id(host->GetId())
-      ->set_url(host->GetURL().spec())
-      ->set_type(host->GetType())
       ->set_waiting_for_debugger(waiting_for_debugger));
 }
 
 void TargetHandler::DetachFromTargetInternal(DevToolsAgentHost* host) {
   auto it = attached_hosts_.find(host->GetId());
   if (it == attached_hosts_.end())
     return;
   host->DetachClient(this);
-  client_->TargetRemoved(TargetRemovedParams::Create()->
+  client_->DetachedFromTarget(DetachedFromTargetParams::Create()->
       set_target_id(host->GetId()));
   attached_hosts_.erase(it);
 }
 
 // ----------------- Protocol ----------------------
 
 Response TargetHandler::Enable() {
   if (enabled_)
     return Response::OK();
   enabled_ = true;
   ServiceWorkerDevToolsManager::GetInstance()->AddObserver(this);
   UpdateServiceWorkers();
   UpdateFrames();
   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::SetWaitForDebuggerOnStart(bool value) {
-  wait_for_debugger_on_start_ = value;
+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_) {
+    UpdateServiceWorkers();
+    UpdateFrames();
+  }
   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 {
@@ skipping 13 matching lines @@
   return Response::OK();
 }
 
 Response TargetHandler::GetTargetInfo(
     const std::string& target_id,
     scoped_refptr<TargetInfo>* target_info) {
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetForId(target_id));
   if (!agent_host)
     return Response::InvalidParams("No target with such id");
-  *target_info =TargetInfo::Create()
+  *target_info = TargetInfo::Create()
       ->set_target_id(agent_host->GetId())
       ->set_type(agent_host->GetType())
       ->set_title(agent_host->GetTitle())
       ->set_url(agent_host->GetURL().spec());
   return Response::OK();
 }
 
 Response TargetHandler::ActivateTarget(const std::string& target_id) {
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetForId(target_id));
@@ skipping 62 matching lines @@
 }
 
 void TargetHandler::WorkerDestroyed(
     ServiceWorkerDevToolsAgentHost* host) {
   UpdateServiceWorkers();
 }
 
 }  // namespace target
 }  // namespace devtools
 }  // namespace content