content/browser/devtools/render_view_devtools_agent_host.cc - Issue 635533004: [DevTools] Move DOM domain overrides to DOMHandler

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/devtools/render_view_devtools_agent_host.cc

Issue 635533004: [DevTools] Move DOM domain overrides to DOMHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix for Windows again Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/devtools/render_view_devtools_agent_host.h ('k') | content/browser/devtools/renderer_overrides_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/render_view_devtools_agent_host.cc

diff --git a/content/browser/devtools/render_view_devtools_agent_host.cc b/content/browser/devtools/render_view_devtools_agent_host.cc

index 28d9441ac0153592f6b5f3f0c91f92ff6df1539a..c717a6f26baafe413c6786c59ee157e370bad6e0 100644

--- a/content/browser/devtools/render_view_devtools_agent_host.cc

+++ b/content/browser/devtools/render_view_devtools_agent_host.cc

@@ -110,6 +110,7 @@ void RenderViewDevToolsAgentHost::OnCancelPendingNavigation(

RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)

: render_view_host_(NULL),

+ dom_handler_(new devtools::dom::DOMHandler()),

input_handler_(new devtools::input::InputHandler()),

page_handler_(new devtools::page::PageHandler()),

handler_impl_(new DevToolsProtocolHandlerImpl()),

@@ -118,6 +119,7 @@ RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)

new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)),

power_handler_(new DevToolsPowerHandler()),

reattaching_(false) {

+ handler_impl_->SetDOMHandler(dom_handler_.get());

handler_impl_->SetInputHandler(input_handler_.get());

handler_impl_->SetPageHandler(page_handler_.get());

SetRenderViewHost(rvh);

@@ -376,6 +378,7 @@ void RenderViewDevToolsAgentHost::SetRenderViewHost(RenderViewHost* rvh) {

WebContentsObserver::Observe(WebContents::FromRenderViewHost(rvh));

overrides_handler_->SetRenderViewHost(render_view_host_);

+ dom_handler_->SetRenderViewHost(render_view_host_);

input_handler_->SetRenderViewHost(render_view_host_);

page_handler_->SetRenderViewHost(render_view_host_);

@@ -391,10 +394,11 @@ void RenderViewDevToolsAgentHost::ClearRenderViewHost() {

this,

content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED,

content::Source<RenderWidgetHost>(render_view_host_));

- render_view_host_ = NULL;

+ render_view_host_ = nullptr;

overrides_handler_->ClearRenderViewHost();

- input_handler_->SetRenderViewHost(NULL);

- page_handler_->SetRenderViewHost(NULL);

+ dom_handler_->SetRenderViewHost(nullptr);

+ input_handler_->SetRenderViewHost(nullptr);

+ page_handler_->SetRenderViewHost(nullptr);

}

void RenderViewDevToolsAgentHost::DisconnectWebContents() {