[DevTools] Move DevToolsAgent to RenderFrameImpl.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 585 matching lines @@
         widget_params.routing_id, widget_params.surface_id,
         widget_params.hidden, render_frame->render_view_->screen_info(),
         compositor_deps, web_frame);
     // TODO(kenrb): Observing shouldn't be necessary when we sort out
     // WasShown and WasHidden, separating page-level visibility from
     // frame-level visibility.
     render_frame->render_widget_->RegisterRenderFrame(render_frame);
   }
 
   render_frame->Initialize();
+  // TODO(dgozman): this should actually be in RenderFrameImpl::Initialize,
+  // but we have to somehow differentiate local frame root there.
+  if (proxy_routing_id == MSG_ROUTING_NONE)

[nasko, 2015/03/24 16:17:07]

While this might work, it is a very fragile way to write the code. I'm looking
at the right way to expose the "local frame root" concept and I think we should
land a CL that gives such method prior to this CL.

[Charlie Reis, 2015/03/24 17:25:13]

+1

For comparison, we have a IsCrossProcessSubframe in RenderFrameHostImpl.  I'm ok
with adding something similar, like a IsLocalFrameRoot here or in WebFrame.

+    render_frame->CreateDevToolsAgent();
 }
 
 // static
 RenderFrame* RenderFrame::FromWebFrame(blink::WebFrame* web_frame) {
   return RenderFrameImpl::FromWebFrame(web_frame);
 }
 
 // static
 RenderFrameImpl* RenderFrameImpl::FromWebFrame(blink::WebFrame* web_frame) {
   FrameMap::iterator iter = g_frame_map.Get().find(web_frame);
@@ skipping 43 matching lines @@
       midi_dispatcher_(NULL),
 #if defined(OS_ANDROID)
       media_player_manager_(NULL),
 #endif
 #if defined(ENABLE_BROWSER_CDMS)
       cdm_manager_(NULL),
 #endif
 #if defined(VIDEO_HOLE)
       contains_media_player_(false),
 #endif
+      devtools_agent_(nullptr),
       geolocation_dispatcher_(NULL),
       push_messaging_dispatcher_(NULL),
       presentation_dispatcher_(NULL),
       screen_orientation_dispatcher_(NULL),
       manifest_manager_(NULL),
       accessibility_mode_(AccessibilityModeOff),
       renderer_accessibility_(NULL),
       weak_factory_(this) {
   std::pair<RoutingIDFrameMap::iterator, bool> result =
       g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
@@ skipping 50 matching lines @@
   new SharedWorkerRepository(this);
 
   if (!frame_->parent())
     new ImageLoadingHelper(this);
 
   // We delay calling this until we have the WebFrame so that any observer or
   // embedder can call GetWebFrame on any RenderFrame.
   GetContentClient()->renderer()->RenderFrameCreated(this);
 }
 
+void RenderFrameImpl::CreateDevToolsAgent() {
+  // We should only create DevToolsAgent for local frame roots.
+  devtools_agent_ = new DevToolsAgent(this);
+}
+
 RenderWidget* RenderFrameImpl::GetRenderWidget() {
   return render_view_.get();
 }
 
 #if defined(ENABLE_PLUGINS)
 void RenderFrameImpl::PepperPluginCreated(RendererPpapiHost* host) {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
                     DidCreatePepperPlugin(host));
   if (host->GetPluginName() == kFlashPluginName) {
     RenderThread::Get()->RecordAction(
@@ skipping 2465 matching lines @@
 
 void RenderFrameImpl::didFinishResourceLoad(blink::WebLocalFrame* frame,
                                             unsigned identifier) {
   DCHECK(!frame_ || frame_ == frame);
   InternalDocumentStateData* internal_data =
       InternalDocumentStateData::FromDataSource(frame->dataSource());
   if (!internal_data->use_error_page())
     return;
 
   // Do not show error page when DevTools is attached.
-  if (render_view_->devtools_agent_ &&
-      render_view_->devtools_agent_->IsAttached()) {
+  // TODO(dgozman): here we should really check DevToolsAgent of local frame
+  // root. How?
+  if (devtools_agent_ && devtools_agent_->IsAttached())
     return;
-  }
 
   // Display error page, if appropriate.
   std::string error_domain = "http";
   int http_status_code = internal_data->http_status_code();
   if (GetContentClient()->renderer()->HasErrorPage(
           http_status_code, &error_domain)) {
     WebURLError error;
     error.unreachableURL = frame->document().url();
     error.domain = WebString::fromUTF8(error_domain);
     error.reason = http_status_code;
@@ skipping 1303 matching lines @@
 
 #if defined(ENABLE_BROWSER_CDMS)
 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
   if (!cdm_manager_)
     cdm_manager_ = new RendererCdmManager(this);
   return cdm_manager_;
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content