Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

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: 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
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 62355fae4b7c50b3ae2430046e84c25548c612d2..fa074c192e8511405aff03cc611ee17c7dcbb4cc 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);
@@ -375,6 +377,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_);
@@ -390,10 +393,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() {

Powered by Google App Engine
This is Rietveld 408576698