Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 0fc35cb87d037f9f330bc1da25ca7754801db471..dcba453c186691b97dd31da0be8df07ddf2d91bf 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -203,6 +203,7 @@ |
#include "content/renderer/java/gin_java_bridge_dispatcher.h" |
#include "content/renderer/media/android/renderer_media_player_manager.h" |
#include "content/renderer/media/android/renderer_media_session_manager.h" |
+#include "content/renderer/media/android/renderer_surface_view_manager.h" |
#include "content/renderer/media/android/stream_texture_factory_impl.h" |
#include "content/renderer/media/android/webmediaplayer_android.h" |
#include "content/renderer/media/android/webmediasession_android.h" |
@@ -980,6 +981,7 @@ RenderFrameImpl::RenderFrameImpl(const CreateParams& params) |
#if defined(OS_ANDROID) |
media_player_manager_(NULL), |
media_session_manager_(NULL), |
+ media_surface_manager_(nullptr), |
#endif |
#if defined(ENABLE_BROWSER_CDMS) |
cdm_manager_(NULL), |
@@ -2511,7 +2513,9 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(), |
std::move(media_renderer_factory), GetCdmFactory(), url_index_, params); |
-#if defined(OS_ANDROID) // WMPI_CAST |
+#if defined(OS_ANDROID) |
+ media_player->SetSurfaceManager(GetSurfaceManager()); |
+ // WMPI_CAST |
media_player->SetMediaPlayerManager(GetMediaPlayerManager()); |
media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); |
#endif |
@@ -5958,6 +5962,11 @@ RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() { |
return media_session_manager_; |
} |
+media::SurfaceManager* RenderFrameImpl::GetSurfaceManager() { |
+ if (!media_surface_manager_) |
+ media_surface_manager_ = new RendererSurfaceViewManager(this); |
+ return media_surface_manager_; |
+} |
#endif // defined(OS_ANDROID) |
scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy( |