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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 #include "content/renderer/gpu/gpu_benchmarking_extension.h" | 62 #include "content/renderer/gpu/gpu_benchmarking_extension.h" |
63 #include "content/renderer/gpu/input_event_filter.h" | 63 #include "content/renderer/gpu/input_event_filter.h" |
64 #include "content/renderer/gpu/input_handler_manager.h" | 64 #include "content/renderer/gpu/input_handler_manager.h" |
65 #include "content/renderer/media/audio_input_message_filter.h" | 65 #include "content/renderer/media/audio_input_message_filter.h" |
66 #include "content/renderer/media/audio_message_filter.h" | 66 #include "content/renderer/media/audio_message_filter.h" |
67 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 67 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
68 #include "content/renderer/media/media_stream_center.h" | 68 #include "content/renderer/media/media_stream_center.h" |
69 #include "content/renderer/media/media_stream_dependency_factory.h" | 69 #include "content/renderer/media/media_stream_dependency_factory.h" |
70 #include "content/renderer/media/midi_message_filter.h" | 70 #include "content/renderer/media/midi_message_filter.h" |
71 #include "content/renderer/media/peer_connection_tracker.h" | 71 #include "content/renderer/media/peer_connection_tracker.h" |
72 #include "content/renderer/media/renderer_gpu_video_decoder_factories.h" | |
73 #include "content/renderer/media/video_capture_impl_manager.h" | 72 #include "content/renderer/media/video_capture_impl_manager.h" |
74 #include "content/renderer/media/video_capture_message_filter.h" | 73 #include "content/renderer/media/video_capture_message_filter.h" |
75 #include "content/renderer/media/webrtc_identity_service.h" | 74 #include "content/renderer/media/webrtc_identity_service.h" |
76 #include "content/renderer/memory_benchmarking_extension.h" | 75 #include "content/renderer/memory_benchmarking_extension.h" |
77 #include "content/renderer/p2p/socket_dispatcher.h" | 76 #include "content/renderer/p2p/socket_dispatcher.h" |
78 #include "content/renderer/plugin_channel_host.h" | 77 #include "content/renderer/plugin_channel_host.h" |
79 #include "content/renderer/render_process_impl.h" | 78 #include "content/renderer/render_process_impl.h" |
80 #include "content/renderer/render_process_visibility_manager.h" | 79 #include "content/renderer/render_process_visibility_manager.h" |
81 #include "content/renderer/render_view_impl.h" | 80 #include "content/renderer/render_view_impl.h" |
82 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 81 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
882 bool RenderThreadImpl::ResolveProxy(const GURL& url, std::string* proxy_list) { | 881 bool RenderThreadImpl::ResolveProxy(const GURL& url, std::string* proxy_list) { |
883 bool result = false; | 882 bool result = false; |
884 Send(new ViewHostMsg_ResolveProxy(url, &result, proxy_list)); | 883 Send(new ViewHostMsg_ResolveProxy(url, &result, proxy_list)); |
885 return result; | 884 return result; |
886 } | 885 } |
887 | 886 |
888 void RenderThreadImpl::PostponeIdleNotification() { | 887 void RenderThreadImpl::PostponeIdleNotification() { |
889 idle_notifications_to_skip_ = 2; | 888 idle_notifications_to_skip_ = 2; |
890 } | 889 } |
891 | 890 |
892 scoped_refptr<media::GpuVideoDecoder::Factories> | 891 scoped_refptr<RendererGpuVideoDecoderFactories> |
893 RenderThreadImpl::GetGpuFactories() { | 892 RenderThreadImpl::GetGpuFactories( |
| 893 const scoped_refptr<base::MessageLoopProxy>& factories_loop) { |
894 DCHECK(IsMainThread()); | 894 DCHECK(IsMainThread()); |
895 | 895 |
896 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 896 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
897 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories; | 897 scoped_refptr<RendererGpuVideoDecoderFactories> gpu_factories; |
898 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; | 898 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; |
899 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) | 899 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) |
900 context3d = GetGpuVDAContext3D(); | 900 context3d = GetGpuVDAContext3D(); |
901 if (context3d) { | 901 if (context3d) { |
902 scoped_refptr<base::MessageLoopProxy> factories_loop = | |
903 compositor_message_loop_proxy(); | |
904 if (!factories_loop.get()) | |
905 factories_loop = base::MessageLoopProxy::current(); | |
906 GpuChannelHost* gpu_channel_host = GetGpuChannel(); | 902 GpuChannelHost* gpu_channel_host = GetGpuChannel(); |
907 if (gpu_channel_host) { | 903 if (gpu_channel_host) { |
908 gpu_factories = new RendererGpuVideoDecoderFactories( | 904 gpu_factories = new RendererGpuVideoDecoderFactories( |
909 gpu_channel_host, factories_loop, context3d); | 905 gpu_channel_host, factories_loop, context3d); |
910 } | 906 } |
911 } | 907 } |
912 return gpu_factories; | 908 return gpu_factories; |
913 } | 909 } |
914 | 910 |
915 /* static */ | 911 /* static */ |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1305 | 1301 |
1306 void RenderThreadImpl::SetFlingCurveParameters( | 1302 void RenderThreadImpl::SetFlingCurveParameters( |
1307 const std::vector<float>& new_touchpad, | 1303 const std::vector<float>& new_touchpad, |
1308 const std::vector<float>& new_touchscreen) { | 1304 const std::vector<float>& new_touchscreen) { |
1309 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1305 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1310 new_touchscreen); | 1306 new_touchscreen); |
1311 | 1307 |
1312 } | 1308 } |
1313 | 1309 |
1314 } // namespace content | 1310 } // namespace content |
OLD | NEW |