Revert current time clamp on ended; clamp paused time instead.

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 <limits>
 #include <string>
 #include <vector>
@@ skipping 273 matching lines @@
 
 void WebMediaPlayerImpl::pause() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   const bool was_already_paused = paused_ || playback_rate_ == 0;
   paused_ = true;
   pipeline_.SetPlaybackRate(0.0f);
   if (data_source_)
     data_source_->MediaIsPaused();
-  paused_time_ = pipeline_.GetMediaTime();
+  UpdatePausedTime();
 
   media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::PAUSE));
 
   if (!was_already_paused && delegate_)
     delegate_->DidPause(this);
 }
 
 bool WebMediaPlayerImpl::supportsSave() const {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   return supports_save_;
@@ skipping 437 matching lines @@
     seek(pending_seek_seconds_);
     return;
   }
 
   if (status != PIPELINE_OK) {
     OnPipelineError(status);
     return;
   }
 
   // Update our paused time.
-  if (paused_)
-    paused_time_ = pipeline_.GetMediaTime();
+  UpdatePausedTime();
 
   should_notify_time_changed_ = time_changed;
 }
 
 void WebMediaPlayerImpl::OnPipelineEnded() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   // Ignore state changes until we've completed all outstanding seeks.
   if (seeking_ || pending_seek_)
@@ skipping 259 matching lines @@
   base::WaitableEvent event(false, false);
   compositor_task_runner_->PostTask(FROM_HERE,
                                     base::Bind(&GetCurrentFrameAndSignal,
                                                base::Unretained(compositor_),
                                                &video_frame,
                                                &event));
   event.Wait();
   return video_frame;
 }
 
+void WebMediaPlayerImpl::UpdatePausedTime() {
+  DCHECK(main_task_runner_->BelongsToCurrentThread());
+  if (paused_) {

[xhwang, 2015/01/08 22:44:50]

I felt it more clear to keep the |paused_| check out of this function, i.e. only
UpdatePausedTime() when |paused_|. WDYT?

[DaleCurtis, 2015/01/08 23:16:41]

Done.

+    paused_time_ =
+        ended_ ? pipeline_.GetMediaDuration() : pipeline_.GetMediaTime();

[xhwang, 2015/01/08 22:44:50]

Hmm, please remind me in what case can |ended_| be true?

[DaleCurtis, 2015/01/08 23:16:41]

pause() is always called upon ended from HTMLMediaElement::UpdatePlayState(). 
Which leads to the issues srirama mentions in the first comment on
https://codereview.chromium.org/740663002

[xhwang, 2015/01/08 23:26:19]

Thanks for the info! Maybe add a comment to make this clear?

[DaleCurtis, 2015/01/08 23:41:53]

Done.

+  }
+}
+
 }  // namespace media