Expand suspension of idle media players to all platforms.

content/renderer/media/webmediaplayer_ms.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/renderer/media/webmediaplayer_ms.h"
 
 #include <stddef.h>
 #include <limits>
 #include <string>
 #include <utility>
@@ skipping 49 matching lines @@
       media_task_runner_(media_task_runner),
       worker_task_runner_(worker_task_runner),
       gpu_factories_(gpu_factories),
       compositor_task_runner_(compositor_task_runner),
       initial_audio_output_device_id_(sink_id.utf8()),
       initial_security_origin_(security_origin.isNull()
                                    ? url::Origin()
                                    : url::Origin(security_origin)),
       volume_(1.0),
       volume_multiplier_(1.0),
-      paused_on_hidden_(false) {
+      should_play_upon_shown_(false) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(client);
   if (delegate_)
     delegate_id_ = delegate_->AddObserver(this);
 
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 }
 
 WebMediaPlayerMS::~WebMediaPlayerMS() {
@@ skipping 76 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
 
   media_log_->AddEvent(media_log_->CreateEvent(media::MediaLogEvent::PLAY));
   if (!paused_)
     return;
 
 #if defined(OS_ANDROID)
   // Don't allow rendering to start while hidden; for either video or audio
   // since this may steal focus from a foreground player.
   if (delegate_ && delegate_->IsHidden()) {
-    paused_on_hidden_ = true;
+    should_play_upon_shown_ = true;
     return;
   }
 #endif
 
   if (video_frame_provider_)
     video_frame_provider_->Play();
 
   compositor_->StartRendering();
 
   if (audio_renderer_)
     audio_renderer_->Play();
 
   if (delegate_) {
     delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false,
                        media::kInfiniteDuration());
   }
 
-  paused_on_hidden_ = false;
+  should_play_upon_shown_ = false;
   paused_ = false;
 }
 
 void WebMediaPlayerMS::pause() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  // Always clear |paused_on_hidden_| since manual pause() should clear it and
-  // an OnHidden() pause will set it appropriately after this call.
-  paused_on_hidden_ = false;
+  should_play_upon_shown_ = false;
   media_log_->AddEvent(media_log_->CreateEvent(media::MediaLogEvent::PAUSE));
   if (paused_)
     return;
 
   if (video_frame_provider_)
     video_frame_provider_->Pause();
 
   compositor_->StopRendering();
   compositor_->ReplaceCurrentFrameWithACopy();
 
@@ skipping 167 matching lines @@
   NOTIMPLEMENTED();
   return 0;
 }
 
 size_t WebMediaPlayerMS::videoDecodedByteCount() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   NOTIMPLEMENTED();
   return 0;
 }
 
-void WebMediaPlayerMS::OnHidden(bool must_suspend) {
+void WebMediaPlayerMS::OnHidden() {
 #if defined(OS_ANDROID)
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Method called when the RenderFrame is sent to background and suspended
   // (android). Substitute the displayed VideoFrame with a copy to avoid
   // holding on to it unnecessarily.
   //
   // During undoable tab closures OnHidden() may be called back to back, so we
   // can't rely on |render_frame_suspended_| being false here.
 
   render_frame_suspended_ = true;
-  if (must_suspend) {
-    if (!paused_) {
-      pause();
-      paused_on_hidden_ = true;
-    }
-
-    if (delegate_)
-      delegate_->PlayerGone(delegate_id_);
-  } else if (!paused_) {
-    // pause() will make its own copy in the block above otherwise.
+  if (!paused_)
     compositor_->ReplaceCurrentFrameWithACopy();
-  }
 #endif  // defined(OS_ANDROID)
 }
 
 void WebMediaPlayerMS::OnShown() {
 #if defined(OS_ANDROID)
   DCHECK(thread_checker_.CalledOnValidThread());
 
   render_frame_suspended_ = false;
 
-  // Resume playback on visibility. play() clears |paused_on_hidden_|.
-  if (paused_on_hidden_)
+  // Resume playback on visibility. play() clears |should_play_upon_shown_|.
+  if (should_play_upon_shown_)
     play();
 #endif  // defined(OS_ANDROID)
 }
 
+void WebMediaPlayerMS::OnSuspendRequested(bool must_suspend) {
+#if defined(OS_ANDROID)
+  if (!must_suspend)
+    return;
+
+  if (!paused_) {
+    pause();
+    should_play_upon_shown_ = true;
+  }
+
+  if (delegate_)
+    delegate_->PlayerGone(delegate_id_);
+
+  render_frame_suspended_ = true;
+#endif
+}
+
 void WebMediaPlayerMS::OnPlay() {
   play();
   client_->playbackStateChanged();
 }
 
 void WebMediaPlayerMS::OnPause() {
-  const bool was_playing = !paused_ || paused_on_hidden_;
+  const bool was_playing = !paused_ || should_play_upon_shown_;
   pause();
   client_->playbackStateChanged();
 
   // MediaSession may suspend the background player if a foreground player
   // starts playing audio, in this case we want to track this so that when
   // OnShown() is called, we resume into the right state.
   if (was_playing && delegate_ && delegate_->IsHidden())
-    paused_on_hidden_ = true;
+    should_play_upon_shown_ = true;
 }
 
 void WebMediaPlayerMS::OnVolumeMultiplierUpdate(double multiplier) {
   volume_multiplier_ = multiplier;
   setVolume(volume_);
 }
 
 bool WebMediaPlayerMS::copyVideoTextureToPlatformTexture(
     blink::WebGraphicsContext3D* web_graphics_context,
     unsigned int texture,
@@ skipping 94 matching lines @@
 media::SkCanvasVideoRenderer* WebMediaPlayerMS::GetSkCanvasVideoRenderer() {
   return &video_renderer_;
 }
 
 void WebMediaPlayerMS::ResetCanvasCache() {
   DCHECK(thread_checker_.CalledOnValidThread());
   video_renderer_.ResetCache();
 }
 
 }  // namespace content