Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index c000e4b1588c415812b3d801c4360ca1d0074e85..4ffde7fb76110a1c3e8ef6a800cbbbbeaef2c6a0 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -5192,30 +5192,14 @@ WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer( |
SynchronousCompositorFactory::GetInstance()) { |
stream_texture_factory = factory->CreateStreamTextureFactory(routing_id_); |
} else { |
- GpuChannelHost* gpu_channel_host = |
- RenderThreadImpl::current()->EstablishGpuChannelSync( |
- CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); |
- |
- if (!gpu_channel_host) { |
- LOG(ERROR) << "Failed to establish GPU channel for media player"; |
- return NULL; |
- } |
- |
- scoped_refptr<cc_blink::ContextProviderWebContext> context_provider = |
- RenderThreadImpl::current()->SharedMainThreadContextProvider(); |
- |
- if (!context_provider.get()) { |
- LOG(ERROR) << "Failed to get context3d for media player"; |
- return NULL; |
- } |
- |
- stream_texture_factory = StreamTextureFactoryImpl::Create( |
- context_provider, gpu_channel_host, routing_id_); |
+ stream_texture_factory = |
+ RenderThreadImpl::current()->GetStreamTexureFactory(); |
} |
- return new WebMediaPlayerAndroid( |
- frame_, client, encrypted_client, weak_factory_.GetWeakPtr(), |
- GetMediaPlayerManager(), GetCdmFactory(), stream_texture_factory, params); |
+ return new WebMediaPlayerAndroid(frame_, client, encrypted_client, |
+ weak_factory_.GetWeakPtr(), |
+ GetMediaPlayerManager(), GetCdmFactory(), |
+ stream_texture_factory, routing_id_, params); |
} |
RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { |