Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 0ac71eeed443e1e4c3b300b6601a2f76d394da0d..547e263e99138433c77c5305c2be9e2a10d3482b 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -153,6 +153,8 @@ |
#include "content/renderer/media/android/renderer_media_player_manager.h" |
#include "content/renderer/media/android/stream_texture_factory_impl.h" |
#include "content/renderer/media/android/webmediaplayer_android.h" |
+#else |
+#include "webkit/common/gpu/context_provider_web_context.h" |
#endif |
#if defined(ENABLE_PEPPER_CDMS) |
@@ -474,6 +476,16 @@ CommonNavigationParams MakeCommonNavigationParams( |
return params; |
} |
+#if !defined(OS_ANDROID) |
+media::Context3D GetSharedMainThreadContext3D() { |
+ cc::ContextProvider* provider = |
+ RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); |
+ if (!provider) |
+ return media::Context3D(); |
+ return media::Context3D(provider->ContextGL(), provider->GrContext()); |
+} |
+#endif |
+ |
RenderFrameImpl::CreateRenderFrameImplFunction g_create_render_frame_impl = |
nullptr; |
@@ -1802,7 +1814,8 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
render_thread->GetAudioRendererMixerManager()->CreateInput( |
render_view_->routing_id_, routing_id_), |
media_log, render_thread->GetMediaThreadTaskRunner(), |
- render_thread->compositor_message_loop_proxy(), initial_cdm); |
+ render_thread->compositor_message_loop_proxy(), |
+ base::Bind(&GetSharedMainThreadContext3D), initial_cdm); |
#if defined(ENABLE_PEPPER_CDMS) |
scoped_ptr<media::CdmFactory> cdm_factory( |