| Index: content/browser/media/android/browser_media_player_manager.cc
|
| diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
|
| index 79cbe61f00b41058f8f2a5406d470b2fb7db680d..45a05782595df8a70d90dcc8f9147f4b72ca22dd 100644
|
| --- a/content/browser/media/android/browser_media_player_manager.cc
|
| +++ b/content/browser/media/android/browser_media_player_manager.cc
|
| @@ -333,7 +333,12 @@ void BrowserMediaPlayerManager::RequestMediaResources(int player_id) {
|
| }
|
|
|
| void BrowserMediaPlayerManager::ReleaseMediaResources(int player_id) {
|
| - // Nothing needs to be done.
|
| +#if defined(VIDEO_HOLE)
|
| + WebContentsViewAndroid* view =
|
| + static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
|
| + if (view)
|
| + view->ReleaseExternalVideoSurface(player_id);
|
| +#endif // defined(VIDEO_HOLE)
|
| }
|
|
|
| media::MediaResourceGetter*
|
| @@ -473,8 +478,11 @@ void BrowserMediaPlayerManager::OnNotifyExternalSurface(
|
|
|
| WebContentsViewAndroid* view =
|
| static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
|
| - if (view)
|
| - view->NotifyExternalSurface(player_id, is_request, rect);
|
| + if (view) {
|
| + if (is_request)
|
| + view->RequestExternalVideoSurface(player_id);
|
| + view->NotifyExternalVideoSurfacePositionChanged(player_id, rect);
|
| + }
|
| }
|
| #endif // defined(VIDEO_HOLE)
|
|
|
| @@ -499,6 +507,12 @@ void BrowserMediaPlayerManager::OnEnterFullscreen(int player_id) {
|
| return;
|
| }
|
|
|
| +#if defined(VIDEO_HOLE)
|
| + WebContentsViewAndroid* view =
|
| + static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
|
| + if (view)
|
| + view->ReleaseExternalVideoSurface(player_id);
|
| +#endif // defined(VIDEO_HOLE)
|
| if (video_view_.get()) {
|
| fullscreen_player_id_ = player_id;
|
| video_view_->OpenVideo();
|
| @@ -571,13 +585,6 @@ void BrowserMediaPlayerManager::OnReleaseResources(int player_id) {
|
| MediaPlayerAndroid* player = GetPlayer(player_id);
|
| if (player)
|
| player->Release();
|
| -
|
| -#if defined(VIDEO_HOLE)
|
| - WebContentsViewAndroid* view =
|
| - static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
|
| - if (view)
|
| - view->NotifyExternalSurface(player_id, false, gfx::RectF());
|
| -#endif // defined(VIDEO_HOLE)
|
| }
|
|
|
| void BrowserMediaPlayerManager::OnDestroyPlayer(int player_id) {
|
|
|