media: Cancel any pending pipeline restart when the player is hidden

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 1064 matching lines @@
   // playback. The user can still control these players via the MediaSession UI.
   // If the player has never started playback, OnSuspendRequested() will handle
   // release of any idle resources.
   if (!hasVideo() && !paused_ && !ended_)
     return;
 
   // Always reset the buffering strategy to normal when suspending for hidden to
   // prevent an idle network connection from lingering.
   setBufferingStrategy(WebMediaPlayer::BufferingStrategy::Normal);
   pipeline_controller_.Suspend();
+  // If we're in the middle of a suspend/resume cycle we no longer want to
+  // resume when the suspend completes.
+  pending_suspend_resume_cycle_ = false;
   if (delegate_)
     delegate_->PlayerGone(delegate_id_);
 }
 
 void WebMediaPlayerImpl::OnShown() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   if (!IsSuspendUponHiddenEnabled())
     return;
 
 #if defined(OS_ANDROID)  // WMPI_CAST
@@ skipping 422 matching lines @@
 bool WebMediaPlayerImpl::IsAutomaticResumeAllowed() {
 #if defined(OS_ANDROID)
   return !hasVideo() || (delegate_ && !delegate_->IsHidden());
 #else
   // On non-Android platforms Resume() is always allowed.
   return true;
 #endif
 }
 
 }  // namespace media