[DevTools] Expose DevToolsAgentHost for OOPIF, display it in chrome://inspect.

content/browser/devtools/render_frame_devtools_agent_host.cc

 // Copyright (c) 2012 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/render_frame_devtools_agent_host.h"
 
 #include "base/basictypes.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 63 matching lines @@
 
 scoped_refptr<DevToolsAgentHost>
 DevToolsAgentHost::GetOrCreateFor(WebContents* web_contents) {
   RenderFrameDevToolsAgentHost* result = FindAgentHost(web_contents);
   if (!result)
     result = new RenderFrameDevToolsAgentHost(web_contents->GetMainFrame());
   return result;
 }
 
 // static
+scoped_refptr<DevToolsAgentHost> RenderFrameDevToolsAgentHost::GetOrCreateFor(
+    RenderFrameHost* host) {
+  RenderFrameDevToolsAgentHost* result = FindAgentHost(host);
+  if (!result)
+    result = new RenderFrameDevToolsAgentHost(host);
+  return result;
+}
+
+// static
+void RenderFrameDevToolsAgentHost::AppendAgentHostForFrameIfApplicable(
+    DevToolsAgentHost::List* result, RenderFrameHost* host) {

[Charlie Reis, 2015/03/06 21:33:50]

Style nit: Each parameter on its own line if the method and parameters can't all
fit on one line.

[dgozman, 2015/03/07 14:13:01]

Done.

+  RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(host);
+  if (!rfh->IsRenderFrameLive())
+    return;
+  if (rfh->IsCrossProcessSubframe() || !rfh->GetParent())
+    result->push_back(RenderFrameDevToolsAgentHost::GetOrCreateFor(rfh));
+}
+
+// static
 bool DevToolsAgentHost::HasFor(WebContents* web_contents) {
   return FindAgentHost(web_contents) != NULL;
 }
 
 // static
 bool DevToolsAgentHost::IsDebuggerAttached(WebContents* web_contents) {
   RenderFrameDevToolsAgentHost* agent_host = FindAgentHost(web_contents);
   return agent_host && agent_host->IsAttached();
 }
 
 //static
-std::vector<WebContents*> DevToolsAgentHostImpl::GetInspectableWebContents() {
-  std::set<WebContents*> set;
-  scoped_ptr<RenderWidgetHostIterator> widgets(
-      RenderWidgetHost::GetRenderWidgetHosts());
-  while (RenderWidgetHost* widget = widgets->GetNextHost()) {
-    // Ignore processes that don't have a connection, such as crashed contents.
-    if (!widget->GetProcess()->HasConnection())
-      continue;
-    if (!widget->IsRenderView())
-      continue;
-
-    RenderViewHost* rvh = RenderViewHost::From(widget);
-    WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
-    if (web_contents)
-      set.insert(web_contents);
-  }
-  std::vector<WebContents*> result(set.size());
-  std::copy(set.begin(), set.end(), result.begin());
-  return result;
+void RenderFrameDevToolsAgentHost::AddAllAgentHosts(
+    DevToolsAgentHost::List* result) {
+  base::Callback<void(RenderFrameHost*)> callback = base::Bind(
+      RenderFrameDevToolsAgentHost::AppendAgentHostForFrameIfApplicable,
+      base::Unretained(result));
+  for (const auto& wc : WebContentsImpl::GetAllWebContents())
+    wc->ForEachFrame(callback);
 }
 
 // static
 void RenderFrameDevToolsAgentHost::OnCancelPendingNavigation(
     RenderFrameHost* pending,
     RenderFrameHost* current) {
   RenderFrameDevToolsAgentHost* agent_host = FindAgentHost(pending);
   if (!agent_host)
     return;
   agent_host->DisconnectRenderFrameHost();
@@ skipping 278 matching lines @@
                                           const NotificationDetails& details) {
   if (type == content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED) {
     bool visible = *Details<bool>(details).ptr();
     page_handler_->OnVisibilityChanged(visible);
   }
 }
 
 void RenderFrameDevToolsAgentHost::SetRenderFrameHost(RenderFrameHost* rfh) {
   DCHECK(!render_frame_host_);
   render_frame_host_ = static_cast<RenderFrameHostImpl*>(rfh);
+  // TODO(dgozman): here we should DCHECK that frame host is either root or
+  // cross process subframe, but this requires handling cross-process
+  // navigation.

[Charlie Reis, 2015/03/06 21:33:50]

Is there a bug number we can cite here?

[dgozman, 2015/03/07 14:13:01]

Done.

 
   WebContentsObserver::Observe(WebContents::FromRenderFrameHost(rfh));
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       rfh->GetRenderViewHost());
   dom_handler_->SetRenderViewHost(rvh);
   input_handler_->SetRenderViewHost(rvh);
   network_handler_->SetRenderViewHost(rvh);
   page_handler_->SetRenderViewHost(rvh);
 
   registrar_.Add(
@@ skipping 19 matching lines @@
 
 void RenderFrameDevToolsAgentHost::DisconnectWebContents() {
   DisconnectRenderFrameHost();
 }
 
 void RenderFrameDevToolsAgentHost::ConnectWebContents(WebContents* wc) {
   ConnectRenderFrameHost(wc->GetMainFrame());
 }
 
 DevToolsAgentHost::Type RenderFrameDevToolsAgentHost::GetType() {
-  return TYPE_WEB_CONTENTS;
+  return IsChildFrame() ? TYPE_FRAME : TYPE_WEB_CONTENTS;
 }
 
 std::string RenderFrameDevToolsAgentHost::GetTitle() {
+  if (IsChildFrame())
+    return GetURL().spec();
   if (WebContents* web_contents = GetWebContents())
     return base::UTF16ToUTF8(web_contents->GetTitle());
   return "";
 }
 
 GURL RenderFrameDevToolsAgentHost::GetURL() {
-  if (WebContents* web_contents = GetWebContents())
-    return web_contents->GetVisibleURL();
   return render_frame_host_ ?
       render_frame_host_->GetLastCommittedURL() : GURL();
 }
 
 bool RenderFrameDevToolsAgentHost::Activate() {
   if (render_frame_host_) {
     render_frame_host_->GetRenderViewHost()->GetDelegate()->Activate();
     return true;
   }
   return false;
@@ skipping 54 matching lines @@
   ProcessChunkedMessageFromAgent(message);
 }
 
 void RenderFrameDevToolsAgentHost::DispatchOnInspectorFrontend(
     const std::string& message) {
   if (!IsAttached() || !render_frame_host_)
     return;
   SendMessageToClient(message);
 }
 
+bool RenderFrameDevToolsAgentHost::IsChildFrame() {
+  return render_frame_host_ && render_frame_host_->GetParent();
+}
+
 }  // namespace content