Fix incorrect set of playing state in WebMediaPlayerAndroid.

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 <limits>
 
 #include "base/android/build_info.h"
 #include "base/bind.h"
@@ skipping 748 matching lines @@
   // know that the playback has finished. To solve this, we set the
   // current time to media duration when OnPlaybackComplete() get called.
   interpolator_.SetBounds(duration_, duration_);
   client_->timeChanged();
 
   // if the loop attribute is set, timeChanged() will update the current time
   // to 0. It will perform a seek to 0. As the requests to the renderer
   // process are sequential, the OnSeekComplete() will only occur
   // once OnPlaybackComplete() is done. As the playback can only be executed
   // upon completion of OnSeekComplete(), the request needs to be saved.
-  is_playing_ = false;
+  UpdatePlayingState(false);

[qinmin, 2014/09/16 17:28:24]

you can just remove this statement, it does nothing here.
client_->timeChanged() will call pause() if time_==duration(), so when this line
is reached, player should already in a paused state.

[DaleCurtis, 2014/09/16 17:30:27]

I'm not sure about that.  If the element is set to loop, pause() will not be
called here.

   if (seeking_ && seek_time_ == base::TimeDelta())
     pending_playback_ = true;
 }
 
 void WebMediaPlayerAndroid::OnBufferingUpdate(int percentage) {
   buffered_[0].end = has_valid_metadata_ ? duration() * percentage / 100 : 0;
   did_loading_progress_ = true;
 }
 
 void WebMediaPlayerAndroid::OnSeekRequest(const base::TimeDelta& time_to_seek) {
@@ skipping 521 matching lines @@
 
 void WebMediaPlayerAndroid::SetNeedsEstablishPeer(bool needs_establish_peer) {
   needs_establish_peer_ = needs_establish_peer;
 }
 
 void WebMediaPlayerAndroid::setPoster(const blink::WebURL& poster) {
   player_manager_->SetPoster(player_id_, poster);
 }
 
 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) {
-  const bool was_playing = is_playing_;
+  if (is_playing == is_playing_)
+    return;
+
   is_playing_ = is_playing;
-  if (!delegate_ || was_playing == is_playing_)
-    return;
+
   if (is_playing)
     interpolator_.StartInterpolating();
   else
     interpolator_.StopInterpolating();
-  if (is_playing)
-    delegate_->DidPlay(this);
-  else
-    delegate_->DidPause(this);
+
+  if (delegate_) {

[qinmin, 2014/09/16 17:28:24]

Thanks for fixing my mistake here.
I remember i put the interpolator code in front of the if(delegate_) statement
below in https://codereview.chromium.org/545993002/, but while resolving all the
merge conflicts I mistakenly reversed the order

+    if (is_playing)
+      delegate_->DidPlay(this);
+    else
+      delegate_->DidPause(this);
+  }
 }
 
 #if defined(VIDEO_HOLE)
 bool WebMediaPlayerAndroid::UpdateBoundaryRectangle() {
   if (!video_weblayer_)
     return false;
 
   // Compute the geometry of video frame layer.
   cc::Layer* layer = video_weblayer_->layer();
   gfx::RectF rect(layer->bounds());
@@ skipping 460 matching lines @@
 
 bool WebMediaPlayerAndroid::IsHLSStream() const {
   std::string mime;
   GURL url = redirected_url_.is_empty() ? url_ : redirected_url_;
   if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime))
     return false;
   return !mime.compare("application/x-mpegurl");
 }
 
 }  // namespace content