Use GPU blacklist to control accelerated video decode.
BUG=137247,142402,141500,139683
TEST=about:gpu page
Review URL: https://chromiumcodereview.appspot.com/10832356
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152167 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 9ad4497..daf5848 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2403,18 +2403,10 @@
collection->AddAudioRenderer(audio_renderer);
}
- // Accelerated video decode is not enabled by default on Linux.
- // crbug.com/137247
- bool use_accelerated_video_decode = false;
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
- use_accelerated_video_decode = true;
-#endif
- use_accelerated_video_decode &= !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableAcceleratedVideoDecode);
- WebGraphicsContext3DCommandBufferImpl* context3d =
- use_accelerated_video_decode ?
- RenderThreadImpl::current()->GetGpuVDAContext3D() :
- NULL;
+ WebGraphicsContext3DCommandBufferImpl* context3d = NULL;
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableAcceleratedVideoDecode))
+ context3d = RenderThreadImpl::current()->GetGpuVDAContext3D();
if (context3d) {
scoped_refptr<base::MessageLoopProxy> factories_loop =
RenderThreadImpl::current()->compositor_thread() ?
