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

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: Fixed review comments 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/devtools/renderer_overrides_handler.h" 21 #include "content/browser/devtools/renderer_overrides_handler.h"
17 #include "content/browser/renderer_host/render_process_host_impl.h" 22 #include "content/browser/renderer_host/render_process_host_impl.h"
18 #include "content/browser/renderer_host/render_view_host_impl.h" 23 #include "content/browser/renderer_host/render_view_host_impl.h"
19 #include "content/browser/site_instance_impl.h" 24 #include "content/browser/site_instance_impl.h"
20 #include "content/browser/web_contents/web_contents_impl.h" 25 #include "content/browser/web_contents/web_contents_impl.h"
21 #include "content/common/devtools_messages.h" 26 #include "content/common/devtools_messages.h"
22 #include "content/common/view_messages.h" 27 #include "content/common/view_messages.h"
23 #include "content/public/browser/content_browser_client.h" 28 #include "content/public/browser/content_browser_client.h"
24 #include "content/public/browser/devtools_manager_delegate.h" 29 #include "content/public/browser/devtools_manager_delegate.h"
25 #include "content/public/browser/notification_service.h" 30 #include "content/public/browser/notification_service.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 agent_host->ConnectRenderViewHost(current); 112 agent_host->ConnectRenderViewHost(current);
108 } 113 }
109 114
110 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh) 115 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
111 : render_view_host_(NULL), 116 : render_view_host_(NULL),
112 dom_handler_(new devtools::dom::DOMHandler()), 117 dom_handler_(new devtools::dom::DOMHandler()),
113 input_handler_(new devtools::input::InputHandler()), 118 input_handler_(new devtools::input::InputHandler()),
114 network_handler_(new devtools::network::NetworkHandler()), 119 network_handler_(new devtools::network::NetworkHandler()),
115 page_handler_(new devtools::page::PageHandler()), 120 page_handler_(new devtools::page::PageHandler()),
116 power_handler_(new devtools::power::PowerHandler()), 121 power_handler_(new devtools::power::PowerHandler()),
122 tracing_handler_(new devtools::tracing::TracingHandler(
123 devtools::tracing::TracingHandler::Renderer)),
117 handler_impl_(new DevToolsProtocolHandlerImpl()), 124 handler_impl_(new DevToolsProtocolHandlerImpl()),
118 overrides_handler_(new RendererOverridesHandler()), 125 overrides_handler_(new RendererOverridesHandler()),
119 tracing_handler_(
120 new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)),
121 reattaching_(false) { 126 reattaching_(false) {
122 handler_impl_->SetDOMHandler(dom_handler_.get()); 127 handler_impl_->SetDOMHandler(dom_handler_.get());
123 handler_impl_->SetInputHandler(input_handler_.get()); 128 handler_impl_->SetInputHandler(input_handler_.get());
124 handler_impl_->SetNetworkHandler(network_handler_.get()); 129 handler_impl_->SetNetworkHandler(network_handler_.get());
125 handler_impl_->SetPageHandler(page_handler_.get()); 130 handler_impl_->SetPageHandler(page_handler_.get());
126 handler_impl_->SetPowerHandler(power_handler_.get()); 131 handler_impl_->SetPowerHandler(power_handler_.get());
132 handler_impl_->SetTracingHandler(tracing_handler_.get());
127 SetRenderViewHost(rvh); 133 SetRenderViewHost(rvh);
128 DevToolsProtocol::Notifier notifier(base::Bind( 134 DevToolsProtocol::Notifier notifier(base::Bind(
129 &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend, 135 &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend,
130 base::Unretained(this))); 136 base::Unretained(this)));
131 handler_impl_->SetNotifier(notifier); 137 handler_impl_->SetNotifier(notifier);
132 overrides_handler_->SetNotifier(notifier); 138 overrides_handler_->SetNotifier(notifier);
133 tracing_handler_->SetNotifier(notifier);
134 g_instances.Get().push_back(this); 139 g_instances.Get().push_back(this);
135 AddRef(); // Balanced in RenderViewHostDestroyed. 140 AddRef(); // Balanced in RenderViewHostDestroyed.
136 DevToolsManager::GetInstance()->AgentHostChanged(this); 141 DevToolsManager::GetInstance()->AgentHostChanged(this);
137 } 142 }
138 143
139 WebContents* RenderViewDevToolsAgentHost::GetWebContents() { 144 WebContents* RenderViewDevToolsAgentHost::GetWebContents() {
140 return web_contents(); 145 return web_contents();
141 } 146 }
142 147
143 void RenderViewDevToolsAgentHost::DispatchProtocolMessage( 148 void RenderViewDevToolsAgentHost::DispatchProtocolMessage(
(...skipping 13 matching lines...) Expand all
157 if (delegate) { 162 if (delegate) {
158 scoped_ptr<base::DictionaryValue> overridden_response_value( 163 scoped_ptr<base::DictionaryValue> overridden_response_value(
159 delegate->HandleCommand(this, message_dict.get())); 164 delegate->HandleCommand(this, message_dict.get()));
160 if (overridden_response_value) 165 if (overridden_response_value)
161 overridden_response = DevToolsProtocol::ParseResponse( 166 overridden_response = DevToolsProtocol::ParseResponse(
162 overridden_response_value.get()); 167 overridden_response_value.get());
163 } 168 }
164 if (!overridden_response.get()) 169 if (!overridden_response.get())
165 overridden_response = overrides_handler_->HandleCommand(command); 170 overridden_response = overrides_handler_->HandleCommand(command);
166 if (!overridden_response.get()) 171 if (!overridden_response.get())
167 overridden_response = tracing_handler_->HandleCommand(command);
168 if (!overridden_response.get())
169 overridden_response = handler_impl_->HandleCommand(command); 172 overridden_response = handler_impl_->HandleCommand(command);
170 if (overridden_response.get()) { 173 if (overridden_response.get()) {
171 if (!overridden_response->is_async_promise()) 174 if (!overridden_response->is_async_promise())
172 OnDispatchOnInspectorFrontend(overridden_response->Serialize()); 175 OnDispatchOnInspectorFrontend(overridden_response->Serialize());
173 return; 176 return;
174 } 177 }
175 } 178 }
176 179
177 IPCDevToolsAgentHost::DispatchProtocolMessage(message); 180 IPCDevToolsAgentHost::DispatchProtocolMessage(message);
178 } 181 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 InitDisplaySleepBlocker(render_view_host_->GetView()->GetNativeView()); 214 InitDisplaySleepBlocker(render_view_host_->GetView()->GetNativeView());
212 } 215 }
213 #endif 216 #endif
214 } 217 }
215 218
216 void RenderViewDevToolsAgentHost::OnClientDetached() { 219 void RenderViewDevToolsAgentHost::OnClientDetached() {
217 #if defined(OS_ANDROID) 220 #if defined(OS_ANDROID)
218 power_save_blocker_.reset(); 221 power_save_blocker_.reset();
219 #endif 222 #endif
220 overrides_handler_->OnClientDetached(); 223 overrides_handler_->OnClientDetached();
221 tracing_handler_->OnClientDetached();
222 page_handler_->Detached(); 224 page_handler_->Detached();
223 power_handler_->Detached(); 225 power_handler_->Detached();
226 tracing_handler_->Detached();
224 ClientDetachedFromRenderer(); 227 ClientDetachedFromRenderer();
225 228
226 // TODO(kaznacheev): Move this call back to DevToolsManager when 229 // TODO(kaznacheev): Move this call back to DevToolsManager when
227 // extensions::ProcessManager no longer relies on this notification. 230 // extensions::ProcessManager no longer relies on this notification.
228 if (!reattaching_) 231 if (!reattaching_)
229 DevToolsAgentHostImpl::NotifyCallbacks(this, false); 232 DevToolsAgentHostImpl::NotifyCallbacks(this, false);
230 } 233 }
231 234
232 void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() { 235 void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() {
233 if (!render_view_host_) 236 if (!render_view_host_)
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 } 505 }
503 506
504 void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend( 507 void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend(
505 const std::string& message) { 508 const std::string& message) {
506 if (!render_view_host_) 509 if (!render_view_host_)
507 return; 510 return;
508 SendMessageToClient(message); 511 SendMessageToClient(message);
509 } 512 }
510 513
511 } // namespace content 514 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698