[Video] Don't pause video-only elements if they're already paused...

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 1143 matching lines @@
   // TODO(avayvod): Remove this when disabling and enabling video tracks in
   // non-playing state works correctly. See https://crbug.com/678374.
   EnableVideoTrackIfNeeded();
   is_pipeline_resuming_ = true;
 }
 
 void WebMediaPlayerImpl::OnPipelineResumed() {
   is_pipeline_resuming_ = false;
 
   if (IsHidden()) {
-    DisableVideoTrackIfNeeded();
+    if (ShouldPauseVideoWhenHidden())
+      PauseVideoIfNeeded();
+    else
+      DisableVideoTrackIfNeeded();
   } else {
     EnableVideoTrackIfNeeded();
   }
 }
 
 void WebMediaPlayerImpl::OnDemuxerOpened() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   client_->mediaSourceOpened(
       new WebMediaSourceImpl(chunk_demuxer_, media_log_));
 }
@@ skipping 229 matching lines @@
     video_weblayer_->layer()->SetContentsOpaque(opaque_);
 }
 
 void WebMediaPlayerImpl::OnFrameHidden() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   if (watch_time_reporter_)
     watch_time_reporter_->OnHidden();
 
   if (ShouldPauseVideoWhenHidden()) {
-    if (!paused_when_hidden_) {
-      // OnPause() will set |paused_when_hidden_| to false and call
-      // UpdatePlayState(), so set the flag to true after and then return.
-      OnPause();
-      paused_when_hidden_ = true;
-      return;
-    }
+    PauseVideoIfNeeded();
+    return;
   } else {
     DisableVideoTrackIfNeeded();
   }
 
   UpdatePlayState();
 
   // Schedule suspended playing media to be paused if the user doesn't come back
   // to it within some timeout period to avoid any autoplay surprises.
   ScheduleIdlePauseTimer();
 }
@@ skipping 744 matching lines @@
   base::TimeDelta duration = GetPipelineMediaDuration();
   if (duration < max_keyframe_distance_to_disable_background_video_)
     return true;
 
   // Otherwise, only optimize videos with shorter average keyframe distance.
   PipelineStatistics stats = GetPipelineStatistics();
   return stats.video_keyframe_distance_average <
          max_keyframe_distance_to_disable_background_video_;
 }
 
+void WebMediaPlayerImpl::PauseVideoIfNeeded() {
+  if (is_pipeline_resuming_ || seeking_ || paused_ || paused_when_hidden_)

[sandersd (OOO until July 31), 2017/01/20 21:24:19]

Require or DCHECK IsHidden?

Do we need to also check if the pipeline has been started yet?

+    return;
+
+  // OnPause() will set |paused_when_hidden_| to false and call
+  // UpdatePlayState(), so set the flag to true after and then return.
+  OnPause();
+  paused_when_hidden_ = true;
+}
+
 void WebMediaPlayerImpl::EnableVideoTrackIfNeeded() {
   DCHECK(!IsHidden());
 
   // Don't change video track while the pipeline is resuming or seeking.
   if (is_pipeline_resuming_ || seeking_)
     return;
 
   if (video_track_disabled_) {
     video_track_disabled_ = false;
     if (client_->hasSelectedVideoTrack()) {
@@ skipping 47 matching lines @@
     UMA_HISTOGRAM_TIMES(
         "Media.Video.TimeFromForegroundToFirstFrame.DisableTrack",
         time_to_first_frame);
   } else {
     UMA_HISTOGRAM_TIMES("Media.Video.TimeFromForegroundToFirstFrame.Paused",
                         time_to_first_frame);
   }
 }
 
 }  // namespace media