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 362 matching lines @@
   NOTIMPLEMENTED();
   return 0;
 }
 
 unsigned 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_)
     play();
 #endif  // defined(OS_ANDROID)
 }
 
+void WebMediaPlayerMS::OnSuspend(bool must_suspend) {
+#if defined(OS_ANDROID)
+  if (!must_suspend)
+    return;
+
+  if (!paused_) {
+    pause();
+    paused_on_hidden_ = 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_;
   pause();
   client_->playbackStateChanged();
 
@@ skipping 109 matching lines @@
 media::SkCanvasVideoRenderer* WebMediaPlayerMS::GetSkCanvasVideoRenderer() {
   return &video_renderer_;
 }
 
 void WebMediaPlayerMS::ResetCanvasCache() {
   DCHECK(thread_checker_.CalledOnValidThread());
   video_renderer_.ResetCache();
 }
 
 }  // namespace content