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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 10917167: Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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
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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 browser_plugin_registry_.reset(new content::old::BrowserPluginRegistry()); 301 browser_plugin_registry_.reset(new content::old::BrowserPluginRegistry());
301 browser_plugin_channel_manager_.reset( 302 browser_plugin_channel_manager_.reset(
302 new content::old::BrowserPluginChannelManager()); 303 new content::old::BrowserPluginChannelManager());
303 AddObserver(browser_plugin_channel_manager_.get()); 304 AddObserver(browser_plugin_channel_manager_.get());
304 305
305 media_stream_center_ = NULL; 306 media_stream_center_ = NULL;
306 307
307 db_message_filter_ = new DBMessageFilter(); 308 db_message_filter_ = new DBMessageFilter();
308 AddFilter(db_message_filter_.get()); 309 AddFilter(db_message_filter_.get());
309 310
311 #if defined(ENABLE_WEBRTC)
312 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(
313 GetIOMessageLoopProxy());
314 AddFilter(p2p_socket_dispatcher_);
315 #endif // defined(ENABLE_WEBRTC)
310 vc_manager_ = new VideoCaptureImplManager(); 316 vc_manager_ = new VideoCaptureImplManager();
311 AddFilter(vc_manager_->video_capture_message_filter()); 317 AddFilter(vc_manager_->video_capture_message_filter());
312 318
313 audio_input_message_filter_ = new AudioInputMessageFilter(); 319 audio_input_message_filter_ = new AudioInputMessageFilter();
314 AddFilter(audio_input_message_filter_.get()); 320 AddFilter(audio_input_message_filter_.get());
315 321
316 audio_message_filter_ = new AudioMessageFilter(); 322 audio_message_filter_ = new AudioMessageFilter();
317 AddFilter(audio_message_filter_.get()); 323 AddFilter(audio_message_filter_.get());
318 324
319 AddFilter(new IndexedDBMessageFilter); 325 AddFilter(new IndexedDBMessageFilter);
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 } 879 }
874 880
875 void RenderThreadImpl::ReleaseCachedFonts() { 881 void RenderThreadImpl::ReleaseCachedFonts() {
876 Send(new ChildProcessHostMsg_ReleaseCachedFonts()); 882 Send(new ChildProcessHostMsg_ReleaseCachedFonts());
877 } 883 }
878 884
879 #endif // OS_WIN 885 #endif // OS_WIN
880 886
881 bool RenderThreadImpl::IsWebFrameValid(WebKit::WebFrame* web_frame) { 887 bool RenderThreadImpl::IsWebFrameValid(WebKit::WebFrame* web_frame) {
882 if (!web_frame) 888 if (!web_frame)
883 return false; // We must be shutting down. 889 return false; // We must be shutting down.
884 890
885 RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view()); 891 RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view());
886 if (!render_view) 892 if (!render_view)
887 return false; // We must be shutting down. 893 return false; // We must be shutting down.
888 894
889 return true; 895 return true;
890 } 896 }
891 897
892 bool RenderThreadImpl::IsMainThread() { 898 bool RenderThreadImpl::IsMainThread() {
893 return !!current(); 899 return !!current();
894 } 900 }
895 901
896 bool RenderThreadImpl::IsIOThread() { 902 bool RenderThreadImpl::IsIOThread() {
897 return MessageLoop::current() == ChildProcess::current()->io_message_loop(); 903 return MessageLoop::current() == ChildProcess::current()->io_message_loop();
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 1134
1129 scoped_refptr<base::MessageLoopProxy> 1135 scoped_refptr<base::MessageLoopProxy>
1130 RenderThreadImpl::GetFileThreadMessageLoopProxy() { 1136 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
1131 DCHECK(message_loop() == MessageLoop::current()); 1137 DCHECK(message_loop() == MessageLoop::current());
1132 if (!file_thread_.get()) { 1138 if (!file_thread_.get()) {
1133 file_thread_.reset(new base::Thread("Renderer::FILE")); 1139 file_thread_.reset(new base::Thread("Renderer::FILE"));
1134 file_thread_->Start(); 1140 file_thread_->Start();
1135 } 1141 }
1136 return file_thread_->message_loop_proxy(); 1142 return file_thread_->message_loop_proxy();
1137 } 1143 }
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698