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 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
885 bool RenderThreadImpl::ResolveProxy(const GURL& url, std::string* proxy_list) { | 884 bool RenderThreadImpl::ResolveProxy(const GURL& url, std::string* proxy_list) { |
886 bool result = false; | 885 bool result = false; |
887 Send(new ViewHostMsg_ResolveProxy(url, &result, proxy_list)); | 886 Send(new ViewHostMsg_ResolveProxy(url, &result, proxy_list)); |
888 return result; | 887 return result; |
889 } | 888 } |
890 | 889 |
891 void RenderThreadImpl::PostponeIdleNotification() { | 890 void RenderThreadImpl::PostponeIdleNotification() { |
892 idle_notifications_to_skip_ = 2; | 891 idle_notifications_to_skip_ = 2; |
893 } | 892 } |
894 | 893 |
895 scoped_refptr<media::GpuVideoDecoderFactories> | 894 scoped_refptr<RendererGpuVideoDecoderFactories> |
896 RenderThreadImpl::GetGpuFactories() { | 895 RenderThreadImpl::GetGpuFactories( |
| 896 const scoped_refptr<base::MessageLoopProxy>& factories_loop) { |
897 DCHECK(IsMainThread()); | 897 DCHECK(IsMainThread()); |
898 | 898 |
899 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 899 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
900 scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories; | 900 scoped_refptr<RendererGpuVideoDecoderFactories> gpu_factories; |
901 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; | 901 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; |
902 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) | 902 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) |
903 context3d = GetGpuVDAContext3D(); | 903 context3d = GetGpuVDAContext3D(); |
904 if (context3d) { | 904 if (context3d) { |
905 scoped_refptr<base::MessageLoopProxy> factories_loop = | |
906 compositor_message_loop_proxy(); | |
907 if (!factories_loop.get()) | |
908 factories_loop = base::MessageLoopProxy::current(); | |
909 GpuChannelHost* gpu_channel_host = GetGpuChannel(); | 905 GpuChannelHost* gpu_channel_host = GetGpuChannel(); |
910 if (gpu_channel_host) { | 906 if (gpu_channel_host) { |
911 gpu_factories = new RendererGpuVideoDecoderFactories( | 907 gpu_factories = new RendererGpuVideoDecoderFactories( |
912 gpu_channel_host, factories_loop, context3d); | 908 gpu_channel_host, factories_loop, context3d); |
913 } | 909 } |
914 } | 910 } |
915 return gpu_factories; | 911 return gpu_factories; |
916 } | 912 } |
917 | 913 |
918 /* static */ | 914 /* static */ |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1308 | 1304 |
1309 void RenderThreadImpl::SetFlingCurveParameters( | 1305 void RenderThreadImpl::SetFlingCurveParameters( |
1310 const std::vector<float>& new_touchpad, | 1306 const std::vector<float>& new_touchpad, |
1311 const std::vector<float>& new_touchscreen) { | 1307 const std::vector<float>& new_touchscreen) { |
1312 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1308 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1313 new_touchscreen); | 1309 new_touchscreen); |
1314 | 1310 |
1315 } | 1311 } |
1316 | 1312 |
1317 } // namespace content | 1313 } // namespace content |
OLD | NEW |