| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index a2cc30276823bf341c90abf188280968a1c46729..06d639f4c476c0c7d843176dc061fa6fe97a495f 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -2383,11 +2383,16 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
|
| collection->AddAudioRenderer(audio_renderer);
|
| }
|
|
|
| + bool use_accelerated_video_decode = false;
|
| +#if defined(OS_CHROMEOS)
|
| + use_accelerated_video_decode = true;
|
| +#endif
|
| + use_accelerated_video_decode &= !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kDisableAcceleratedVideoDecode);
|
| base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> context3d =
|
| - !CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableAcceleratedVideoDecode) ?
|
| - base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>() :
|
| - RenderThreadImpl::current()->GetGpuVDAContext3D();
|
| + use_accelerated_video_decode ?
|
| + RenderThreadImpl::current()->GetGpuVDAContext3D() :
|
| + base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>();
|
| if (context3d) {
|
| MessageLoop* factories_loop =
|
| RenderThreadImpl::current()->compositor_thread() ?
|
|
|