| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 63938f91deffebb60a97f36c3ed7aaa6f30bb513..62df25e16a398ad3260a868ed0cc6baecb31b143 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -2748,20 +2748,11 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
|
| }
|
|
|
| scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories;
|
| - WebGraphicsContext3DCommandBufferImpl* context3d = NULL;
|
| - if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
|
| - context3d = RenderThreadImpl::current()->GetGpuVDAContext3D();
|
| - if (context3d) {
|
| - scoped_refptr<base::MessageLoopProxy> factories_loop =
|
| - RenderThreadImpl::current()->compositor_message_loop_proxy();
|
| - if (!factories_loop)
|
| - factories_loop = base::MessageLoopProxy::current();
|
| - GpuChannelHost* gpu_channel_host =
|
| - RenderThreadImpl::current()->EstablishGpuChannelSync(
|
| - CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
|
| - gpu_factories = new RendererGpuVideoDecoderFactories(
|
| - gpu_channel_host, factories_loop, context3d);
|
| - }
|
| + scoped_refptr<base::MessageLoopProxy> factories_loop =
|
| + RenderThreadImpl::current()->compositor_message_loop_proxy();
|
| + if (!factories_loop)
|
| + factories_loop = base::MessageLoopProxy::current();
|
| + gpu_factories = RenderThreadImpl::current()->GetGpuFactories(factories_loop);
|
|
|
| webkit_media::WebMediaPlayerParams params(
|
| sink, gpu_factories, new RenderMediaLog());
|
|
|