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

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

Issue 19638008: Refactor GpuVideoDecoder::Factories out of GpuVideoDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 5 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
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/render_view_impl.cc » ('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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "content/renderer/render_process_visibility_manager.h" 80 #include "content/renderer/render_process_visibility_manager.h"
81 #include "content/renderer/render_view_impl.h" 81 #include "content/renderer/render_view_impl.h"
82 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 82 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
83 #include "content/renderer/skia_benchmarking_extension.h" 83 #include "content/renderer/skia_benchmarking_extension.h"
84 #include "grit/content_resources.h" 84 #include "grit/content_resources.h"
85 #include "ipc/ipc_channel_handle.h" 85 #include "ipc/ipc_channel_handle.h"
86 #include "ipc/ipc_forwarding_message_filter.h" 86 #include "ipc/ipc_forwarding_message_filter.h"
87 #include "ipc/ipc_platform_file.h" 87 #include "ipc/ipc_platform_file.h"
88 #include "media/base/audio_hardware_config.h" 88 #include "media/base/audio_hardware_config.h"
89 #include "media/base/media.h" 89 #include "media/base/media.h"
90 #include "media/filters/gpu_video_decoder_factories.h"
90 #include "net/base/net_errors.h" 91 #include "net/base/net_errors.h"
91 #include "net/base/net_util.h" 92 #include "net/base/net_util.h"
92 #include "third_party/WebKit/public/platform/WebString.h" 93 #include "third_party/WebKit/public/platform/WebString.h"
93 #include "third_party/WebKit/public/web/WebColorName.h" 94 #include "third_party/WebKit/public/web/WebColorName.h"
94 #include "third_party/WebKit/public/web/WebDatabase.h" 95 #include "third_party/WebKit/public/web/WebDatabase.h"
95 #include "third_party/WebKit/public/web/WebDocument.h" 96 #include "third_party/WebKit/public/web/WebDocument.h"
96 #include "third_party/WebKit/public/web/WebFrame.h" 97 #include "third_party/WebKit/public/web/WebFrame.h"
97 #include "third_party/WebKit/public/web/WebKit.h" 98 #include "third_party/WebKit/public/web/WebKit.h"
98 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" 99 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h"
99 #include "third_party/WebKit/public/web/WebPopupMenu.h" 100 #include "third_party/WebKit/public/web/WebPopupMenu.h"
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 bool RenderThreadImpl::ResolveProxy(const GURL& url, std::string* proxy_list) { 883 bool RenderThreadImpl::ResolveProxy(const GURL& url, std::string* proxy_list) {
883 bool result = false; 884 bool result = false;
884 Send(new ViewHostMsg_ResolveProxy(url, &result, proxy_list)); 885 Send(new ViewHostMsg_ResolveProxy(url, &result, proxy_list));
885 return result; 886 return result;
886 } 887 }
887 888
888 void RenderThreadImpl::PostponeIdleNotification() { 889 void RenderThreadImpl::PostponeIdleNotification() {
889 idle_notifications_to_skip_ = 2; 890 idle_notifications_to_skip_ = 2;
890 } 891 }
891 892
892 scoped_refptr<media::GpuVideoDecoder::Factories> 893 scoped_refptr<media::GpuVideoDecoderFactories>
893 RenderThreadImpl::GetGpuFactories() { 894 RenderThreadImpl::GetGpuFactories() {
894 DCHECK(IsMainThread()); 895 DCHECK(IsMainThread());
895 896
896 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 897 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
897 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories; 898 scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories;
898 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; 899 WebGraphicsContext3DCommandBufferImpl* context3d = NULL;
899 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) 900 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
900 context3d = GetGpuVDAContext3D(); 901 context3d = GetGpuVDAContext3D();
901 if (context3d) { 902 if (context3d) {
902 scoped_refptr<base::MessageLoopProxy> factories_loop = 903 scoped_refptr<base::MessageLoopProxy> factories_loop =
903 compositor_message_loop_proxy(); 904 compositor_message_loop_proxy();
904 if (!factories_loop.get()) 905 if (!factories_loop.get())
905 factories_loop = base::MessageLoopProxy::current(); 906 factories_loop = base::MessageLoopProxy::current();
906 GpuChannelHost* gpu_channel_host = GetGpuChannel(); 907 GpuChannelHost* gpu_channel_host = GetGpuChannel();
907 if (gpu_channel_host) { 908 if (gpu_channel_host) {
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 1306
1306 void RenderThreadImpl::SetFlingCurveParameters( 1307 void RenderThreadImpl::SetFlingCurveParameters(
1307 const std::vector<float>& new_touchpad, 1308 const std::vector<float>& new_touchpad,
1308 const std::vector<float>& new_touchscreen) { 1309 const std::vector<float>& new_touchscreen) {
1309 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, 1310 webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
1310 new_touchscreen); 1311 new_touchscreen);
1311 1312
1312 } 1313 }
1313 1314
1314 } // namespace content 1315 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698