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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1385883002: Leave CreateStreamTexture route id out of the GL interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 5a9da313bc67b3f7b2932be454a43784b50d4c8b..08a75fa906140737a7f46414faedd655e7ff18e5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5232,30 +5232,18 @@ 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";
+ stream_texture_factory =
+ RenderThreadImpl::current()->GetStreamTexureFactory();
+ if (!stream_texture_factory.get()) {
+ LOG(ERROR) << "Failed to get stream texture factory!";
return NULL;
}
-
- stream_texture_factory = StreamTextureFactoryImpl::Create(
- context_provider, gpu_channel_host, routing_id_);
}
- 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() {

Powered by Google App Engine
This is Rietveld 408576698