Restart fullscreen video playback when switching back from background

content/browser/media/android/browser_media_player_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/android/browser_media_player_manager.h"
 
 #include "base/command_line.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_demuxer_android.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
@@ skipping 122 matching lines @@
                         OnNotifyExternalSurface)
 #endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserMediaPlayerManager::FullscreenPlayerPlay() {
   MediaPlayerAndroid* player = GetFullscreenPlayer();
   if (player) {
-    if (fullscreen_player_is_released_) {
-      video_view_->OpenVideo();
-      fullscreen_player_is_released_ = false;
-    }
     player->Start();
     Send(new MediaPlayerMsg_DidMediaPlayerPlay(
         routing_id(), fullscreen_player_id_));
   }
 }
 
 void BrowserMediaPlayerManager::FullscreenPlayerPause() {
   MediaPlayerAndroid* player = GetFullscreenPlayer();
   if (player) {
     player->Pause(true);
     Send(new MediaPlayerMsg_DidMediaPlayerPause(
         routing_id(), fullscreen_player_id_));
   }
 }
 
 void BrowserMediaPlayerManager::FullscreenPlayerSeek(int msec) {
   MediaPlayerAndroid* player = GetFullscreenPlayer();
   if (player) {
-    // TODO(kbalazs): if |fullscreen_player_is_released_| is true
-    // at this point, player->GetCurrentTime() will be wrong until
+    // TODO(kbalazs): if the fullscreen player has been Release()-d and
+    // not restarted yet, player->GetCurrentTime() will be wrong until
     // FullscreenPlayerPlay (http://crbug.com/322798).
     OnSeekRequest(fullscreen_player_id_,
                   base::TimeDelta::FromMilliseconds(msec));
   }
 }
 
 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) {
   Send(new MediaPlayerMsg_DidExitFullscreen(
       routing_id(), fullscreen_player_id_));
   video_view_.reset();
@@ skipping 266 matching lines @@
   OnExitFullscreen(fullscreen_player_id_);
 }
 
 void BrowserMediaPlayerManager::OnEnterFullscreen(int player_id) {
   DCHECK_EQ(fullscreen_player_id_, -1);
   if (media_keys_ids_pending_approval_.find(player_id) !=
       media_keys_ids_pending_approval_.end()) {
     return;
   }
 
-  if (video_view_.get()) {
-    fullscreen_player_id_ = player_id;
-    video_view_->OpenVideo();
-  } else if (!ContentVideoView::HasContentVideoView()) {
+  if (!ContentVideoView::HasContentVideoView()) {
     // In Android WebView, two ContentViewCores could both try to enter
     // fullscreen video, we just ignore the second one.
     fullscreen_player_id_ = player_id;
     ContentViewCoreImpl* content_view_core_impl =
         ContentViewCoreImpl::FromWebContents(web_contents());
     video_view_.reset(new ContentVideoView(content_view_core_impl->GetContext(),
         content_view_core_impl->GetContentVideoViewClient(), this));
   }
 }
 
 void BrowserMediaPlayerManager::OnExitFullscreen(int player_id) {
   if (fullscreen_player_id_ == player_id) {
     MediaPlayerAndroid* player = GetPlayer(player_id);
     if (player)
       player->SetVideoSurface(gfx::ScopedJavaSurface());
-    video_view_->OnExitFullscreen();
+    video_view_.reset();
+    fullscreen_player_id_ = -1;
   }
 }
 
 void BrowserMediaPlayerManager::OnInitialize(
     MediaPlayerHostMsg_Initialize_Type type,
     int player_id,
     const GURL& url,
     const GURL& first_party_for_cookies,
     int demuxer_client_id) {
   DCHECK(type != MEDIA_PLAYER_TYPE_MEDIA_SOURCE || demuxer_client_id > 0)
@@ skipping 35 matching lines @@
 void BrowserMediaPlayerManager::OnSetVolume(int player_id, double volume) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player)
     player->SetVolume(volume);
 }
 
 void BrowserMediaPlayerManager::OnReleaseResources(int player_id) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player)
     player->Release();
-  if (player_id == fullscreen_player_id_)
-    fullscreen_player_is_released_ = true;
 
 #if defined(GOOGLE_TV)
   WebContentsViewAndroid* view =
       static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
   if (view)
     view->NotifyExternalSurface(player_id, false, gfx::RectF());
 #endif
 }
 
 void BrowserMediaPlayerManager::OnDestroyPlayer(int player_id) {
@@ skipping 200 matching lines @@
   if (pending_fullscreen_player_id_ != media_keys_id)
     return;
 
   pending_fullscreen_player_id_ = -1;
   MediaPlayerAndroid* player = GetPlayer(media_keys_id);
   if (player->IsPlaying())
     OnProtectedSurfaceRequested(media_keys_id);
 }
 
 }  // namespace content