Expand suspension of idle media players to all platforms.

content/renderer/media/android/webmediaplayer_android.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/android/webmediaplayer_android.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 126 matching lines @@
 
   SkImageInfo info = SkImageInfo::MakeN32Premul(desc.fWidth, desc.fHeight);
   SkGrPixelRef* pixel_ref = new SkGrPixelRef(info, texture.get());
   if (!pixel_ref)
     return false;
   bitmap->setInfo(info);
   bitmap->setPixelRef(pixel_ref)->unref();
   return true;
 }
 
+bool IsSuspendResumeEnabled() {
+  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableMediaSuspend);
+}
+
 class SyncTokenClientImpl : public media::VideoFrame::SyncTokenClient {
  public:
   explicit SyncTokenClientImpl(
       blink::WebGraphicsContext3D* web_graphics_context)
       : web_graphics_context_(web_graphics_context) {}
   ~SyncTokenClientImpl() override {}
   void GenerateSyncToken(gpu::SyncToken* sync_token) override {
     const blink::WGC3Duint64 fence_sync =
         web_graphics_context_->insertFenceSyncCHROMIUM();
     web_graphics_context_->shallowFlushCHROMIUM();
@@ skipping 1349 matching lines @@
 
 void WebMediaPlayerAndroid::OnWaitingForDecryptionKey() {
   encrypted_client_->didBlockPlaybackWaitingForKey();
 
   // TODO(jrummell): didResumePlaybackBlockedForKey() should only be called
   // when a key has been successfully added (e.g. OnSessionKeysChange() with
   // |has_additional_usable_key| = true). http://crbug.com/461903
   encrypted_client_->didResumePlaybackBlockedForKey();
 }
 
-void WebMediaPlayerAndroid::OnHidden(bool must_suspend) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableMediaSuspend)) {
+void WebMediaPlayerAndroid::OnHidden() {
+  if (!IsSuspendResumeEnabled())
     return;
-  }
 
   // If we're idle or playing video, pause and release resources; audio only
   // players are allowed to continue playing in the background unless indicated
   // otherwise by the call.
-  if (must_suspend || (paused() && playback_completed_) || hasVideo())
+  if ((paused() && playback_completed_) || hasVideo())
     SuspendAndReleaseResources();
 }
 
 void WebMediaPlayerAndroid::OnShown() {}
 
+void WebMediaPlayerAndroid::OnSuspend(bool must_suspend) {
+  if (must_suspend)
+    SuspendAndReleaseResources();
+}
+
 void WebMediaPlayerAndroid::OnPlay() {
   play();
   client_->playbackStateChanged();
 }
 
 void WebMediaPlayerAndroid::OnPause() {
   pause();
   client_->playbackStateChanged();
 }
 
@@ skipping 122 matching lines @@
     result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
   } else if (is_hls_url == is_hls) {
     result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
   }
   UMA_HISTOGRAM_ENUMERATION(
       "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
       result, PREDICTION_RESULT_MAX);
 }
 
 }  // namespace content