[DevTools] Move DevToolsAgent to RenderFrameImpl.

content/renderer/render_view_impl.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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 53 matching lines @@
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/common/web_preferences.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
-#include "content/renderer/devtools/devtools_agent.h"
 #include "content/renderer/disambiguation_popup_helper.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
 #include "content/renderer/drop_data_builder.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/history_controller.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/idle_user_detector.h"
 #include "content/renderer/ime_event_guard.h"
 #include "content/renderer/input/input_handler_manager.h"
 #include "content/renderer/internal_document_state_data.h"
@@ skipping 324 matching lines @@
 
 static void ConvertToFaviconSizes(
     const blink::WebVector<blink::WebSize>& web_sizes,
     std::vector<gfx::Size>* sizes) {
   DCHECK(sizes->empty());
   sizes->reserve(web_sizes.size());
   for (size_t i = 0; i < web_sizes.size(); ++i)
     sizes->push_back(gfx::Size(web_sizes[i]));
 }
 
+static blink::WebDevToolsAgent* GetWebDevToolsAgent(WebView* webview) {
+  if (!webview || !webview->mainFrame()->isWebLocalFrame())
+    return nullptr;
+  return webview->mainFrame()->toWebLocalFrame()->devToolsAgent();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 struct RenderViewImpl::PendingFileChooser {
   PendingFileChooser(const FileChooserParams& p, WebFileChooserCompletion* c)
       : params(p),
         completion(c) {
   }
   FileChooserParams params;
   WebFileChooserCompletion* completion;  // MAY BE NULL to skip callback.
 };
@@ skipping 201 matching lines @@
       history_list_offset_(-1),
       history_list_length_(0),
       frames_in_progress_(0),
       target_url_status_(TARGET_NONE),
       uses_temporary_zoom_level_(false),
 #if defined(OS_ANDROID)
       top_controls_constraints_(TOP_CONTROLS_STATE_BOTH),
 #endif
       has_scrolled_focused_editable_node_into_rect_(false),
       speech_recognition_dispatcher_(NULL),
-      devtools_agent_(NULL),
       mouse_lock_dispatcher_(NULL),
 #if defined(OS_ANDROID)
       expected_content_intent_id_(0),
 #endif
 #if defined(OS_WIN)
       focused_plugin_id_(-1),
 #endif
 #if defined(ENABLE_PLUGINS)
       plugin_find_handler_(NULL),
       focused_pepper_plugin_(NULL),
@@ skipping 89 matching lines @@
 
   // In --site-per-process, just use the WebRemoteFrame as the main frame.
   if (command_line.HasSwitch(switches::kSitePerProcess) && proxy) {
     webview()->setMainFrame(proxy->web_frame());
     // Initialize the WebRemoteFrame with information replicated from the
     // browser process.
     proxy->SetReplicatedState(params.replicated_frame_state);
   } else {
     webview()->setMainFrame(main_render_frame_->GetWebFrame());
   }
+  // Here we have |main_render_frame_|, which does not really have blink::Frame
+  // instance inside, and creating DevToolsAgent fails with assertions.
+  // This happens because WebView receives WebRemoteFrame as a main frame,
+  // but |main_render_frame_| still points to WebLocalFrame instance.
   main_render_frame_->Initialize();

[dgozman, 2015/03/25 16:25:50]

This causes crash for me. See comment above. Any ideas?

 
   if (switches::IsTouchDragDropEnabled())
     webview()->settings()->setTouchDragDropEnabled(true);
 
   if (switches::IsTouchEditingEnabled())
     webview()->settings()->setTouchEditingEnabled(true);
 
   if (!params.frame_name.empty())
     webview()->mainFrame()->setName(params.frame_name);
 
   // TODO(davidben): Move this state from Blink into content.
   if (params.window_was_created_with_opener)
     webview()->setOpenedByDOM();
 
   OnSetRendererPrefs(params.renderer_preferences);
 
   if (!params.enable_auto_resize) {
     OnResize(params.initial_size);
   } else {
     OnEnableAutoResize(params.min_size, params.max_size);
   }
 
   new MHTMLGenerator(this);
 #if defined(OS_MACOSX)
   new TextInputClientObserver(this);
 #endif  // defined(OS_MACOSX)
 
+  // TODO(dgozman): do this not for main frame, but for local frame roots.
+  if (blink::WebDevToolsAgent* devToolsAgent = GetWebDevToolsAgent(webview())) {
+    if (RenderWidgetCompositor* rwc = compositor())
+      devToolsAgent->setLayerTreeId(rwc->GetLayerTreeId());
+  }
+
   // The next group of objects all implement RenderViewObserver, so are deleted
   // along with the RenderView automatically.
-  if (!proxy) {
-    devtools_agent_ = new DevToolsAgent(main_render_frame_.get());
-    if (RenderWidgetCompositor* rwc = compositor())
-      webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId());
-  }
-
   mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
 
   history_controller_.reset(new HistoryController(this));
 
   new IdleUserDetector(this);
 
   if (command_line.HasSwitch(switches::kDomAutomationController))
     enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
   if (command_line.HasSwitch(switches::kStatsCollectionController))
     enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION;
@@ skipping 1218 matching lines @@
   Send(new ViewHostMsg_FocusedNodeTouched(
       routing_id(), text_input_type != blink::WebTextInputTypeNone));
 #endif
 }
 
 void RenderViewImpl::initializeLayerTreeView() {
   RenderWidget::initializeLayerTreeView();
   RenderWidgetCompositor* rwc = compositor();
   if (!rwc)
     return;
-  if (webview() && webview()->devToolsAgent())
-    webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId());
+  // TODO(dgozman): do this not for main frame, but for local frame roots.
+  if (blink::WebDevToolsAgent* devToolsAgent = GetWebDevToolsAgent(webview()))
+    devToolsAgent->setLayerTreeId(rwc->GetLayerTreeId());
 
   bool use_threaded_event_handling = true;
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   // Disable threaded event handling if content is not handling the elastic
   // overscroll effect. This includes the cases where the elastic overscroll
   // effect is being handled by Blink (because of command line flags) and older
   // operating system versions which do not have an elastic overscroll effect
   // (SnowLeopard, which has Aqua scrollbars which need synchronous updates).
   use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled();
 #endif
@@ skipping 1927 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content