Chromium Code Reviews| 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/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 58 #include "content/renderer/gpu/compositor_thread.h" | 58 #include "content/renderer/gpu/compositor_thread.h" |
| 59 #include "content/renderer/gpu/compositor_output_surface.h" | 59 #include "content/renderer/gpu/compositor_output_surface.h" |
| 60 #include "content/renderer/gpu/gpu_benchmarking_extension.h" | 60 #include "content/renderer/gpu/gpu_benchmarking_extension.h" |
| 61 #include "content/renderer/media/audio_hardware.h" | 61 #include "content/renderer/media/audio_hardware.h" |
| 62 #include "content/renderer/media/audio_input_message_filter.h" | 62 #include "content/renderer/media/audio_input_message_filter.h" |
| 63 #include "content/renderer/media/audio_message_filter.h" | 63 #include "content/renderer/media/audio_message_filter.h" |
| 64 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 64 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
| 65 #include "content/renderer/media/media_stream_center.h" | 65 #include "content/renderer/media/media_stream_center.h" |
| 66 #include "content/renderer/media/video_capture_impl_manager.h" | 66 #include "content/renderer/media/video_capture_impl_manager.h" |
| 67 #include "content/renderer/media/video_capture_message_filter.h" | 67 #include "content/renderer/media/video_capture_message_filter.h" |
| 68 #include "content/renderer/p2p/socket_dispatcher.h" | |
| 68 #include "content/renderer/plugin_channel_host.h" | 69 #include "content/renderer/plugin_channel_host.h" |
| 69 #include "content/renderer/render_process_impl.h" | 70 #include "content/renderer/render_process_impl.h" |
| 70 #include "content/renderer/render_view_impl.h" | 71 #include "content/renderer/render_view_impl.h" |
| 71 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 72 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 72 #include "grit/content_resources.h" | 73 #include "grit/content_resources.h" |
| 73 #include "ipc/ipc_channel_handle.h" | 74 #include "ipc/ipc_channel_handle.h" |
| 74 #include "ipc/ipc_forwarding_message_filter.h" | 75 #include "ipc/ipc_forwarding_message_filter.h" |
| 75 #include "ipc/ipc_platform_file.h" | 76 #include "ipc/ipc_platform_file.h" |
| 76 #include "media/base/media.h" | 77 #include "media/base/media.h" |
| 77 #include "net/base/net_errors.h" | 78 #include "net/base/net_errors.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 299 browser_plugin_registry_.reset(new content::old::BrowserPluginRegistry()); | 300 browser_plugin_registry_.reset(new content::old::BrowserPluginRegistry()); |
| 300 browser_plugin_channel_manager_.reset( | 301 browser_plugin_channel_manager_.reset( |
| 301 new content::old::BrowserPluginChannelManager()); | 302 new content::old::BrowserPluginChannelManager()); |
| 302 AddObserver(browser_plugin_channel_manager_.get()); | 303 AddObserver(browser_plugin_channel_manager_.get()); |
| 303 | 304 |
| 304 media_stream_center_ = NULL; | 305 media_stream_center_ = NULL; |
| 305 | 306 |
| 306 db_message_filter_ = new DBMessageFilter(); | 307 db_message_filter_ = new DBMessageFilter(); |
| 307 AddFilter(db_message_filter_.get()); | 308 AddFilter(db_message_filter_.get()); |
| 308 | 309 |
| 310 #if defined(ENABLE_WEBRTC) | |
| 311 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher( | |
| 312 GetIOMessageLoopProxy()); | |
| 313 AddFilter(p2p_socket_dispatcher_.get()); | |
|
tommi (sloooow) - chröme
2012/09/11 12:09:09
nit: no .get()
perkj_chrome
2012/09/11 14:27:30
Done.
| |
| 314 #endif | |
| 309 vc_manager_ = new VideoCaptureImplManager(); | 315 vc_manager_ = new VideoCaptureImplManager(); |
| 310 AddFilter(vc_manager_->video_capture_message_filter()); | 316 AddFilter(vc_manager_->video_capture_message_filter()); |
| 311 | 317 |
| 312 audio_input_message_filter_ = new AudioInputMessageFilter(); | 318 audio_input_message_filter_ = new AudioInputMessageFilter(); |
| 313 AddFilter(audio_input_message_filter_.get()); | 319 AddFilter(audio_input_message_filter_.get()); |
| 314 | 320 |
| 315 audio_message_filter_ = new AudioMessageFilter(); | 321 audio_message_filter_ = new AudioMessageFilter(); |
| 316 AddFilter(audio_message_filter_.get()); | 322 AddFilter(audio_message_filter_.get()); |
| 317 | 323 |
| 318 devtools_agent_message_filter_ = new DevToolsAgentFilter(); | 324 devtools_agent_message_filter_ = new DevToolsAgentFilter(); |
| (...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1127 | 1133 |
| 1128 scoped_refptr<base::MessageLoopProxy> | 1134 scoped_refptr<base::MessageLoopProxy> |
| 1129 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 1135 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 1130 DCHECK(message_loop() == MessageLoop::current()); | 1136 DCHECK(message_loop() == MessageLoop::current()); |
| 1131 if (!file_thread_.get()) { | 1137 if (!file_thread_.get()) { |
| 1132 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1138 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 1133 file_thread_->Start(); | 1139 file_thread_->Start(); |
| 1134 } | 1140 } |
| 1135 return file_thread_->message_loop_proxy(); | 1141 return file_thread_->message_loop_proxy(); |
| 1136 } | 1142 } |
| OLD | NEW |