OLD | NEW |
---|---|
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_impl.h" | 11 #include "content/browser/devtools/devtools_manager_impl.h" |
12 #include "content/browser/devtools/devtools_power_handler.h" | 12 #include "content/browser/devtools/devtools_power_handler.h" |
13 #include "content/browser/devtools/devtools_protocol.h" | 13 #include "content/browser/devtools/devtools_protocol.h" |
14 #include "content/browser/devtools/devtools_protocol_constants.h" | 14 #include "content/browser/devtools/devtools_protocol_constants.h" |
15 #include "content/browser/devtools/devtools_tracing_handler.h" | 15 #include "content/browser/devtools/devtools_tracing_handler.h" |
16 #include "content/browser/devtools/protocol/devtools_protocol_handler.h" | |
16 #include "content/browser/devtools/renderer_overrides_handler.h" | 17 #include "content/browser/devtools/renderer_overrides_handler.h" |
17 #include "content/browser/renderer_host/render_process_host_impl.h" | 18 #include "content/browser/renderer_host/render_process_host_impl.h" |
18 #include "content/browser/renderer_host/render_view_host_impl.h" | 19 #include "content/browser/renderer_host/render_view_host_impl.h" |
19 #include "content/browser/site_instance_impl.h" | 20 #include "content/browser/site_instance_impl.h" |
20 #include "content/browser/web_contents/web_contents_impl.h" | 21 #include "content/browser/web_contents/web_contents_impl.h" |
21 #include "content/common/devtools_messages.h" | 22 #include "content/common/devtools_messages.h" |
22 #include "content/common/view_messages.h" | 23 #include "content/common/view_messages.h" |
23 #include "content/public/browser/content_browser_client.h" | 24 #include "content/public/browser/content_browser_client.h" |
24 #include "content/public/browser/devtools_manager_delegate.h" | 25 #include "content/public/browser/devtools_manager_delegate.h" |
25 #include "content/public/browser/notification_service.h" | 26 #include "content/public/browser/notification_service.h" |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
102 WebContents* web_contents = WebContents::FromRenderViewHost(pending); | 103 WebContents* web_contents = WebContents::FromRenderViewHost(pending); |
103 RenderViewDevToolsAgentHost* agent_host = FindAgentHost(web_contents); | 104 RenderViewDevToolsAgentHost* agent_host = FindAgentHost(web_contents); |
104 if (!agent_host) | 105 if (!agent_host) |
105 return; | 106 return; |
106 agent_host->DisconnectRenderViewHost(); | 107 agent_host->DisconnectRenderViewHost(); |
107 agent_host->ConnectRenderViewHost(current); | 108 agent_host->ConnectRenderViewHost(current); |
108 } | 109 } |
109 | 110 |
110 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh) | 111 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh) |
111 : render_view_host_(NULL), | 112 : render_view_host_(NULL), |
113 handler_impl_(new DevToolsProtocolHandlerImpl()), | |
112 overrides_handler_(new RendererOverridesHandler()), | 114 overrides_handler_(new RendererOverridesHandler()), |
113 tracing_handler_( | 115 tracing_handler_( |
114 new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)), | 116 new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)), |
115 power_handler_(new DevToolsPowerHandler()), | 117 power_handler_(new DevToolsPowerHandler()), |
116 reattaching_(false) { | 118 reattaching_(false) { |
117 SetRenderViewHost(rvh); | 119 SetRenderViewHost(rvh); |
118 DevToolsProtocol::Notifier notifier(base::Bind( | 120 DevToolsProtocol::Notifier notifier(base::Bind( |
119 &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend, | 121 &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend, |
120 base::Unretained(this))); | 122 base::Unretained(this))); |
123 handler_impl_->SetNotifier(notifier); | |
121 overrides_handler_->SetNotifier(notifier); | 124 overrides_handler_->SetNotifier(notifier); |
122 tracing_handler_->SetNotifier(notifier); | 125 tracing_handler_->SetNotifier(notifier); |
123 power_handler_->SetNotifier(notifier); | 126 power_handler_->SetNotifier(notifier); |
124 g_instances.Get().push_back(this); | 127 g_instances.Get().push_back(this); |
125 AddRef(); // Balanced in RenderViewHostDestroyed. | 128 AddRef(); // Balanced in RenderViewHostDestroyed. |
126 } | 129 } |
127 | 130 |
128 WebContents* RenderViewDevToolsAgentHost::GetWebContents() { | 131 WebContents* RenderViewDevToolsAgentHost::GetWebContents() { |
129 return web_contents(); | 132 return web_contents(); |
130 } | 133 } |
(...skipping 18 matching lines...) Expand all Loading... | |
149 if (overridden_response_value) | 152 if (overridden_response_value) |
150 overridden_response = DevToolsProtocol::ParseResponse( | 153 overridden_response = DevToolsProtocol::ParseResponse( |
151 overridden_response_value.get()); | 154 overridden_response_value.get()); |
152 } | 155 } |
153 if (!overridden_response.get()) | 156 if (!overridden_response.get()) |
154 overridden_response = overrides_handler_->HandleCommand(command); | 157 overridden_response = overrides_handler_->HandleCommand(command); |
155 if (!overridden_response.get()) | 158 if (!overridden_response.get()) |
156 overridden_response = tracing_handler_->HandleCommand(command); | 159 overridden_response = tracing_handler_->HandleCommand(command); |
157 if (!overridden_response.get()) | 160 if (!overridden_response.get()) |
158 overridden_response = power_handler_->HandleCommand(command); | 161 overridden_response = power_handler_->HandleCommand(command); |
162 if (!overridden_response.get()) | |
163 overridden_response = handler_impl_->HandleCommand(command); | |
159 if (overridden_response.get()) { | 164 if (overridden_response.get()) { |
160 if (!overridden_response->is_async_promise()) | 165 if (!overridden_response->is_async_promise()) |
161 OnDispatchOnInspectorFrontend(overridden_response->Serialize()); | 166 OnDispatchOnInspectorFrontend(overridden_response->Serialize()); |
162 return; | 167 return; |
163 } | 168 } |
164 } | 169 } |
165 | 170 |
166 IPCDevToolsAgentHost::DispatchProtocolMessage(message); | 171 IPCDevToolsAgentHost::DispatchProtocolMessage(message); |
167 } | 172 } |
168 | 173 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
202 #endif | 207 #endif |
203 } | 208 } |
204 | 209 |
205 void RenderViewDevToolsAgentHost::OnClientDetached() { | 210 void RenderViewDevToolsAgentHost::OnClientDetached() { |
206 #if defined(OS_ANDROID) | 211 #if defined(OS_ANDROID) |
207 power_save_blocker_.reset(); | 212 power_save_blocker_.reset(); |
208 #endif | 213 #endif |
209 overrides_handler_->OnClientDetached(); | 214 overrides_handler_->OnClientDetached(); |
210 tracing_handler_->OnClientDetached(); | 215 tracing_handler_->OnClientDetached(); |
211 power_handler_->OnClientDetached(); | 216 power_handler_->OnClientDetached(); |
217 handler_impl_->OnClientDetached(); | |
212 ClientDetachedFromRenderer(); | 218 ClientDetachedFromRenderer(); |
213 | 219 |
214 // TODO(kaznacheev): Move this call back to DevToolsManagerImpl when | 220 // TODO(kaznacheev): Move this call back to DevToolsManagerImpl when |
215 // extensions::ProcessManager no longer relies on this notification. | 221 // extensions::ProcessManager no longer relies on this notification. |
216 if (!reattaching_) | 222 if (!reattaching_) |
217 DevToolsAgentHostImpl::NotifyCallbacks(this, false); | 223 DevToolsAgentHostImpl::NotifyCallbacks(this, false); |
218 } | 224 } |
219 | 225 |
220 void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() { | 226 void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() { |
221 if (!render_view_host_) | 227 if (!render_view_host_) |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
314 RenderFrameHost* render_frame_host) { | 320 RenderFrameHost* render_frame_host) { |
315 return DispatchIPCMessage(message); | 321 return DispatchIPCMessage(message); |
316 } | 322 } |
317 | 323 |
318 bool RenderViewDevToolsAgentHost::OnMessageReceived( | 324 bool RenderViewDevToolsAgentHost::OnMessageReceived( |
319 const IPC::Message& message) { | 325 const IPC::Message& message) { |
320 return DispatchIPCMessage(message); | 326 return DispatchIPCMessage(message); |
321 } | 327 } |
322 | 328 |
323 void RenderViewDevToolsAgentHost::DidAttachInterstitialPage() { | 329 void RenderViewDevToolsAgentHost::DidAttachInterstitialPage() { |
324 overrides_handler_->DidAttachInterstitialPage(); | 330 overrides_handler_->DidAttachInterstitialPage(); |
dgozman
2014/09/10 13:01:20
RenderViewDTAH should be able to call methods (lik
vkuzkokov
2014/09/11 12:53:03
Done.
| |
325 | 331 |
326 if (!render_view_host_) | 332 if (!render_view_host_) |
327 return; | 333 return; |
328 // The rvh set in AboutToNavigateRenderView turned out to be interstitial. | 334 // The rvh set in AboutToNavigateRenderView turned out to be interstitial. |
329 // Connect back to the real one. | 335 // Connect back to the real one. |
330 WebContents* web_contents = | 336 WebContents* web_contents = |
331 WebContents::FromRenderViewHost(render_view_host_); | 337 WebContents::FromRenderViewHost(render_view_host_); |
332 if (!web_contents) | 338 if (!web_contents) |
333 return; | 339 return; |
334 DisconnectRenderViewHost(); | 340 DisconnectRenderViewHost(); |
(...skipping 12 matching lines...) Expand all Loading... | |
347 overrides_handler_->OnVisibilityChanged(visible); | 353 overrides_handler_->OnVisibilityChanged(visible); |
348 } | 354 } |
349 } | 355 } |
350 | 356 |
351 void RenderViewDevToolsAgentHost::SetRenderViewHost(RenderViewHost* rvh) { | 357 void RenderViewDevToolsAgentHost::SetRenderViewHost(RenderViewHost* rvh) { |
352 DCHECK(!render_view_host_); | 358 DCHECK(!render_view_host_); |
353 render_view_host_ = static_cast<RenderViewHostImpl*>(rvh); | 359 render_view_host_ = static_cast<RenderViewHostImpl*>(rvh); |
354 | 360 |
355 WebContentsObserver::Observe(WebContents::FromRenderViewHost(rvh)); | 361 WebContentsObserver::Observe(WebContents::FromRenderViewHost(rvh)); |
356 overrides_handler_->SetRenderViewHost(render_view_host_); | 362 overrides_handler_->SetRenderViewHost(render_view_host_); |
363 handler_impl_->SetRenderViewHost(render_view_host_); | |
357 | 364 |
358 registrar_.Add( | 365 registrar_.Add( |
359 this, | 366 this, |
360 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED, | 367 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED, |
361 content::Source<RenderWidgetHost>(render_view_host_)); | 368 content::Source<RenderWidgetHost>(render_view_host_)); |
362 } | 369 } |
363 | 370 |
364 void RenderViewDevToolsAgentHost::ClearRenderViewHost() { | 371 void RenderViewDevToolsAgentHost::ClearRenderViewHost() { |
365 DCHECK(render_view_host_); | 372 DCHECK(render_view_host_); |
366 registrar_.Remove( | 373 registrar_.Remove( |
367 this, | 374 this, |
368 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED, | 375 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED, |
369 content::Source<RenderWidgetHost>(render_view_host_)); | 376 content::Source<RenderWidgetHost>(render_view_host_)); |
370 render_view_host_ = NULL; | 377 render_view_host_ = NULL; |
371 overrides_handler_->ClearRenderViewHost(); | 378 overrides_handler_->ClearRenderViewHost(); |
379 handler_impl_->SetRenderViewHost(NULL); | |
372 } | 380 } |
373 | 381 |
374 void RenderViewDevToolsAgentHost::DisconnectWebContents() { | 382 void RenderViewDevToolsAgentHost::DisconnectWebContents() { |
375 DisconnectRenderViewHost(); | 383 DisconnectRenderViewHost(); |
376 } | 384 } |
377 | 385 |
378 void RenderViewDevToolsAgentHost::ConnectWebContents(WebContents* wc) { | 386 void RenderViewDevToolsAgentHost::ConnectWebContents(WebContents* wc) { |
379 ConnectRenderViewHost(wc->GetRenderViewHost()); | 387 ConnectRenderViewHost(wc->GetRenderViewHost()); |
380 } | 388 } |
381 | 389 |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
482 void RenderViewDevToolsAgentHost::OnEnableTracing( | 490 void RenderViewDevToolsAgentHost::OnEnableTracing( |
483 const std::string& category_filter) { | 491 const std::string& category_filter) { |
484 tracing_handler_->EnableTracing(category_filter); | 492 tracing_handler_->EnableTracing(category_filter); |
485 } | 493 } |
486 | 494 |
487 void RenderViewDevToolsAgentHost::OnDisableTracing() { | 495 void RenderViewDevToolsAgentHost::OnDisableTracing() { |
488 tracing_handler_->DisableTracing(); | 496 tracing_handler_->DisableTracing(); |
489 } | 497 } |
490 | 498 |
491 } // namespace content | 499 } // namespace content |
OLD | NEW |