Don't GONE the unsuspended video only players

media/blink/webmediaplayer_impl.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 "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <string>
@@ skipping 1987 matching lines @@
   // don't have to).
   //
   // Similarly, we don't consider |ended_| to be paused. Blink will immediately
   // call pause() or seek(), so |ended_| should not affect the computation.
   // Despite that, |ended_| does result in a separate paused state, to simplfy
   // the contract for SetDelegateState().
   //
   // |has_remote_controls| indicates if the player can be controlled outside the
   // page (e.g. via the notification controls or by audio focus events). Idle
   // suspension does not destroy the media session, because we expect that the
-  // notification controls (and audio focus) remain. The following must be true
-  // for the player to have remote controls:
+  // notification controls (and audio focus) remain. With some exceptions for
+  // background videos, the player only needs to have audio to have controls
+  // (requires |have_future_data|).
+  //
+  // |alive| indicates if the player should be present (not |GONE|) to the
+  // delegate, either paused or playing. The following must be true for the
+  // player:
   //   - |have_future_data|, since we need to know whether we are paused to
   //     correctly configure the session and also because the tracks and
-  //     duration are passed to DidPlay()
-  //   - |is_remote| is false as remote players have their own controls
-  //   - |has_error| is false player should have no errors
-  //   - hasAudio() (requires |have_future_data|)
+  //     duration are passed to DidPlay(),
+  //   - |is_remote| is false as remote playback is not handled by the delegate,
+  //   - |has_error| is false as player should have no errors,
+  //   - |background_suspended| is false, otherwise |has_remote_controls| must
+  //     be true.
   //
   // TODO(sandersd): If Blink told us the paused state sooner, we could detect
   // if the remote controls are available sooner.
 
   // Background videos with audio don't have remote controls if background
   // suspend is enabled and resuming background videos is not (original Android
   // behavior).
   bool backgrounded_video_has_no_remote_controls =
       IsBackgroundedSuspendEnabled() && !IsResumeBackgroundVideosEnabled() &&
       is_backgrounded && hasVideo();
   bool can_play = !has_error && !is_remote && have_future_data;
-  bool has_remote_controls = can_play && !must_suspend && hasAudio() &&
-                             !backgrounded_video_has_no_remote_controls;
-
-  if (!has_remote_controls) {
+  bool has_remote_controls =
+      hasAudio() && !backgrounded_video_has_no_remote_controls;
+  bool alive = can_play && !must_suspend &&
+               (!background_suspended || has_remote_controls);
+  if (!alive) {
     result.delegate_state = DelegateState::GONE;
     result.is_idle = delegate_->IsIdle(delegate_id_);
   } else if (paused_) {
     // TODO(sandersd): Is it possible to have a suspended session, be ended,
     // and not be paused? If so we should be in a PLAYING state.
     result.delegate_state =
         ended_ ? DelegateState::GONE : DelegateState::PAUSED;
     result.is_idle = !seeking_;
   } else {
     result.delegate_state = DelegateState::PLAYING;
@@ skipping 290 matching lines @@
 
 void WebMediaPlayerImpl::RecordUnderflowDuration(base::TimeDelta duration) {
   DCHECK(data_source_ || chunk_demuxer_);
   if (data_source_)
     UMA_HISTOGRAM_TIMES("Media.UnderflowDuration", duration);
   else
     UMA_HISTOGRAM_TIMES("Media.UnderflowDuration.MSE", duration);
 }
 
 }  // namespace media