| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 436193200f65298d91169fb5b4fa87a3aed4719f..eb9971320db4aaff0a97e71a2efcc757be981ee0 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -134,7 +134,6 @@
|
| #include "third_party/WebKit/public/web/WebDataSource.h"
|
| #include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h"
|
| #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h"
|
| -#include "third_party/WebKit/public/web/WebDevToolsAgent.h"
|
| #include "third_party/WebKit/public/web/WebDocument.h"
|
| #include "third_party/WebKit/public/web/WebElement.h"
|
| #include "third_party/WebKit/public/web/WebFileChooserParams.h"
|
| @@ -402,12 +401,6 @@ static void ConvertToFaviconSizes(
|
| 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 {
|
| @@ -803,12 +796,6 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
|
| 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.
|
| mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
|
| @@ -2048,9 +2035,6 @@ void RenderViewImpl::initializeLayerTreeView() {
|
| RenderWidgetCompositor* rwc = compositor();
|
| if (!rwc)
|
| return;
|
| - // 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)
|
|
|