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

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

Issue 2575513004: [DevTools] Migrate input domain to new generator. (Closed)
Patch Set: Created 4 years 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_frame_devtools_agent_host.cc
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index 0169d37e7cfad007a7c1c192b97d136ef7b8cd68..cc814c35cd536b58ae231a776d199841934f9993 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -394,16 +394,12 @@ void RenderFrameDevToolsAgentHost::WebContentsCreated(
RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
RenderFrameHostImpl* host)
: DevToolsAgentHostImpl(base::GenerateGUID()),
- input_handler_(new devtools::input::InputHandler()),
frame_trace_recorder_(nullptr),
protocol_handler_(new DevToolsProtocolHandler(this)),
handlers_frame_host_(nullptr),
current_frame_crashed_(false),
pending_handle_(nullptr),
frame_tree_node_(host->frame_tree_node()) {
- DevToolsProtocolDispatcher* dispatcher = protocol_handler_->dispatcher();
- dispatcher->SetInputHandler(input_handler_.get());
-
SetPending(host);
CommitPending();
WebContentsObserver::Observe(WebContents::FromRenderFrameHost(host));
@@ -478,6 +474,10 @@ void RenderFrameDevToolsAgentHost::Attach() {
dom_handler_->Wire(session()->dispatcher());
dom_handler_->SetRenderFrameHost(handlers_frame_host_);
+ input_handler_.reset(new protocol::InputHandler());
+ input_handler_->Wire(session()->dispatcher());
+ input_handler_->SetRenderFrameHost(handlers_frame_host_);
+
inspector_handler_.reset(new protocol::InspectorHandler());
inspector_handler_->Wire(session()->dispatcher());
inspector_handler_->SetRenderFrameHost(handlers_frame_host_);
@@ -535,6 +535,8 @@ void RenderFrameDevToolsAgentHost::Detach() {
emulation_handler_->Disable();
emulation_handler_.reset();
}
+ input_handler_->Disable();
+ input_handler_.reset();
inspector_handler_->Disable();
inspector_handler_.reset();
io_handler_->Disable();
@@ -962,8 +964,8 @@ void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers(
dom_handler_->SetRenderFrameHost(host);
if (emulation_handler_)
emulation_handler_->SetRenderFrameHost(host);
- input_handler_->SetRenderWidgetHost(
- host ? host->GetRenderWidgetHost() : nullptr);
+ if (input_handler_)
+ input_handler_->SetRenderFrameHost(host);
if (inspector_handler_)
inspector_handler_->SetRenderFrameHost(host);
if (network_handler_)

Powered by Google App Engine
This is Rietveld 408576698