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

Side by Side Diff: content/browser/devtools/render_view_devtools_agent_host.cc

Issue 635733003: [DevTools] Migrate DevToolsTracingHandler to generated handler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/devtools/render_view_devtools_agent_host.h" 5 #include "content/browser/devtools/render_view_devtools_agent_host.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
11 #include "content/browser/devtools/devtools_manager.h" 11 #include "content/browser/devtools/devtools_manager.h"
12 #include "content/browser/devtools/devtools_protocol.h" 12 #include "content/browser/devtools/devtools_protocol.h"
13 #include "content/browser/devtools/devtools_protocol_constants.h" 13 #include "content/browser/devtools/devtools_protocol_constants.h"
14 #include "content/browser/devtools/devtools_tracing_handler.h"
15 #include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h" 14 #include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
15 #include "content/browser/devtools/protocol/dom_handler.h"
16 #include "content/browser/devtools/protocol/input_handler.h"
17 #include "content/browser/devtools/protocol/network_handler.h"
18 #include "content/browser/devtools/protocol/page_handler.h"
19 #include "content/browser/devtools/protocol/power_handler.h"
20 #include "content/browser/devtools/protocol/tracing_handler.h"
16 #include "content/browser/renderer_host/render_process_host_impl.h" 21 #include "content/browser/renderer_host/render_process_host_impl.h"
17 #include "content/browser/renderer_host/render_view_host_impl.h" 22 #include "content/browser/renderer_host/render_view_host_impl.h"
18 #include "content/browser/site_instance_impl.h" 23 #include "content/browser/site_instance_impl.h"
19 #include "content/browser/web_contents/web_contents_impl.h" 24 #include "content/browser/web_contents/web_contents_impl.h"
20 #include "content/common/devtools_messages.h" 25 #include "content/common/devtools_messages.h"
21 #include "content/common/view_messages.h" 26 #include "content/common/view_messages.h"
22 #include "content/public/browser/content_browser_client.h" 27 #include "content/public/browser/content_browser_client.h"
23 #include "content/public/browser/devtools_manager_delegate.h" 28 #include "content/public/browser/devtools_manager_delegate.h"
24 #include "content/public/browser/notification_service.h" 29 #include "content/public/browser/notification_service.h"
25 #include "content/public/browser/notification_types.h" 30 #include "content/public/browser/notification_types.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 agent_host->ConnectRenderViewHost(current); 111 agent_host->ConnectRenderViewHost(current);
107 } 112 }
108 113
109 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh) 114 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
110 : render_view_host_(NULL), 115 : render_view_host_(NULL),
111 dom_handler_(new devtools::dom::DOMHandler()), 116 dom_handler_(new devtools::dom::DOMHandler()),
112 input_handler_(new devtools::input::InputHandler()), 117 input_handler_(new devtools::input::InputHandler()),
113 network_handler_(new devtools::network::NetworkHandler()), 118 network_handler_(new devtools::network::NetworkHandler()),
114 page_handler_(new devtools::page::PageHandler()), 119 page_handler_(new devtools::page::PageHandler()),
115 power_handler_(new devtools::power::PowerHandler()), 120 power_handler_(new devtools::power::PowerHandler()),
121 tracing_handler_(new devtools::tracing::TracingHandler(
122 devtools::tracing::TracingHandler::Renderer)),
116 handler_impl_(new DevToolsProtocolHandlerImpl()), 123 handler_impl_(new DevToolsProtocolHandlerImpl()),
117 tracing_handler_(
118 new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)),
119 reattaching_(false) { 124 reattaching_(false) {
120 handler_impl_->SetDOMHandler(dom_handler_.get()); 125 handler_impl_->SetDOMHandler(dom_handler_.get());
121 handler_impl_->SetInputHandler(input_handler_.get()); 126 handler_impl_->SetInputHandler(input_handler_.get());
122 handler_impl_->SetNetworkHandler(network_handler_.get()); 127 handler_impl_->SetNetworkHandler(network_handler_.get());
123 handler_impl_->SetPageHandler(page_handler_.get()); 128 handler_impl_->SetPageHandler(page_handler_.get());
124 handler_impl_->SetPowerHandler(power_handler_.get()); 129 handler_impl_->SetPowerHandler(power_handler_.get());
130 handler_impl_->SetTracingHandler(tracing_handler_.get());
125 SetRenderViewHost(rvh); 131 SetRenderViewHost(rvh);
126 DevToolsProtocol::Notifier notifier(base::Bind( 132 DevToolsProtocol::Notifier notifier(base::Bind(
127 &RenderViewDevToolsAgentHost::DispatchOnInspectorFrontend, 133 &RenderViewDevToolsAgentHost::DispatchOnInspectorFrontend,
128 base::Unretained(this))); 134 base::Unretained(this)));
129 handler_impl_->SetNotifier(notifier); 135 handler_impl_->SetNotifier(notifier);
130 tracing_handler_->SetNotifier(notifier);
131 g_instances.Get().push_back(this); 136 g_instances.Get().push_back(this);
132 AddRef(); // Balanced in RenderViewHostDestroyed. 137 AddRef(); // Balanced in RenderViewHostDestroyed.
133 DevToolsManager::GetInstance()->AgentHostChanged(this); 138 DevToolsManager::GetInstance()->AgentHostChanged(this);
134 } 139 }
135 140
136 WebContents* RenderViewDevToolsAgentHost::GetWebContents() { 141 WebContents* RenderViewDevToolsAgentHost::GetWebContents() {
137 return web_contents(); 142 return web_contents();
138 } 143 }
139 144
140 void RenderViewDevToolsAgentHost::DispatchProtocolMessage( 145 void RenderViewDevToolsAgentHost::DispatchProtocolMessage(
(...skipping 11 matching lines...) Expand all
152 DevToolsManagerDelegate* delegate = 157 DevToolsManagerDelegate* delegate =
153 DevToolsManager::GetInstance()->delegate(); 158 DevToolsManager::GetInstance()->delegate();
154 if (delegate) { 159 if (delegate) {
155 scoped_ptr<base::DictionaryValue> overridden_response_value( 160 scoped_ptr<base::DictionaryValue> overridden_response_value(
156 delegate->HandleCommand(this, message_dict.get())); 161 delegate->HandleCommand(this, message_dict.get()));
157 if (overridden_response_value) 162 if (overridden_response_value)
158 overridden_response = DevToolsProtocol::ParseResponse( 163 overridden_response = DevToolsProtocol::ParseResponse(
159 overridden_response_value.get()); 164 overridden_response_value.get());
160 } 165 }
161 if (!overridden_response.get()) 166 if (!overridden_response.get())
162 overridden_response = tracing_handler_->HandleCommand(command);
163 if (!overridden_response.get())
164 overridden_response = handler_impl_->HandleCommand(command); 167 overridden_response = handler_impl_->HandleCommand(command);
165 if (overridden_response.get()) { 168 if (overridden_response.get()) {
166 if (!overridden_response->is_async_promise()) 169 if (!overridden_response->is_async_promise())
167 DispatchOnInspectorFrontend(overridden_response->Serialize()); 170 DispatchOnInspectorFrontend(overridden_response->Serialize());
168 return; 171 return;
169 } 172 }
170 } 173 }
171 174
172 IPCDevToolsAgentHost::DispatchProtocolMessage(message); 175 IPCDevToolsAgentHost::DispatchProtocolMessage(message);
173 } 176 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 power_save_blocker_.get()-> 208 power_save_blocker_.get()->
206 InitDisplaySleepBlocker(render_view_host_->GetView()->GetNativeView()); 209 InitDisplaySleepBlocker(render_view_host_->GetView()->GetNativeView());
207 } 210 }
208 #endif 211 #endif
209 } 212 }
210 213
211 void RenderViewDevToolsAgentHost::OnClientDetached() { 214 void RenderViewDevToolsAgentHost::OnClientDetached() {
212 #if defined(OS_ANDROID) 215 #if defined(OS_ANDROID)
213 power_save_blocker_.reset(); 216 power_save_blocker_.reset();
214 #endif 217 #endif
215 tracing_handler_->OnClientDetached();
216 page_handler_->Detached(); 218 page_handler_->Detached();
217 power_handler_->Detached(); 219 power_handler_->Detached();
220 tracing_handler_->Detached();
218 ClientDetachedFromRenderer(); 221 ClientDetachedFromRenderer();
219 222
220 // TODO(kaznacheev): Move this call back to DevToolsManager when 223 // TODO(kaznacheev): Move this call back to DevToolsManager when
221 // extensions::ProcessManager no longer relies on this notification. 224 // extensions::ProcessManager no longer relies on this notification.
222 if (!reattaching_) 225 if (!reattaching_)
223 DevToolsAgentHostImpl::NotifyCallbacks(this, false); 226 DevToolsAgentHostImpl::NotifyCallbacks(this, false);
224 } 227 }
225 228
226 void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() { 229 void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() {
227 if (!render_view_host_) 230 if (!render_view_host_)
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 } 505 }
503 506
504 void RenderViewDevToolsAgentHost::DispatchOnInspectorFrontend( 507 void RenderViewDevToolsAgentHost::DispatchOnInspectorFrontend(
505 const std::string& message) { 508 const std::string& message) {
506 if (!IsAttached() || !render_view_host_) 509 if (!IsAttached() || !render_view_host_)
507 return; 510 return;
508 SendMessageToClient(message); 511 SendMessageToClient(message);
509 } 512 }
510 513
511 } // namespace content 514 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/devtools/render_view_devtools_agent_host.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698