Prepare WebMediaPlayerAndroid for bytesLoaded() -> didLoadingProgress() transition.

webkit/media/android/webmediaplayer_android.cc

 // Copyright (c) 2012 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 "webkit/media/android/webmediaplayer_android.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 42 matching lines @@
       buffered_(1u),
       video_frame_(new WebVideoFrameImpl(VideoFrame::CreateEmptyFrame())),
       proxy_(new WebMediaPlayerProxyAndroid(base::MessageLoopProxy::current(),
                                             AsWeakPtr())),
       prepared_(false),
       duration_(0),
       pending_seek_(0),
       seeking_(false),
       playback_completed_(false),
       buffered_bytes_(0),
+      did_loading_progress_(false),
       cookie_jar_(cookie_jar),
       pending_play_event_(false),
       network_state_(WebMediaPlayer::NetworkStateEmpty),
       ready_state_(WebMediaPlayer::ReadyStateHaveNothing) {
   video_frame_.reset(new WebVideoFrameImpl(VideoFrame::CreateEmptyFrame()));
 }
 
 WebMediaPlayerAndroid::~WebMediaPlayerAndroid() {
   if (media_player_.get()) {
     media_player_->Stop();
@@ skipping 184 matching lines @@
 
 const WebTimeRanges& WebMediaPlayerAndroid::buffered() {
   return buffered_;
 }
 
 float WebMediaPlayerAndroid::maxTimeSeekable() const {
   // TODO(hclam): If this stream is not seekable this should return 0.
   return duration();
 }
 
+bool WebMediaPlayerAndroid::didLoadingProgress() const {
+  bool ret = did_loading_progress_;
+  did_loading_progress_ = false;
+  return ret;
+}
+
 unsigned long long WebMediaPlayerAndroid::bytesLoaded() const {
   return buffered_bytes_;
 }
 
 unsigned long long WebMediaPlayerAndroid::totalBytes() const {
   // Deprecated.
   // TODO(qinmin): Remove this from WebKit::WebMediaPlayer as it is never used.
   return 0;
 }
 
@@ skipping 87 matching lines @@
 
 void WebMediaPlayerAndroid::OnPlaybackComplete() {
   // Set the current time equal to duration to let webkit know that play back
   // is completed.
   playback_completed_ = true;
   client_->timeChanged();
 }
 
 void WebMediaPlayerAndroid::OnBufferingUpdate(int percentage) {
   buffered_[0].end = duration() * percentage / 100;
+  did_loading_progress_ = true;
   // Implement a trick here to fake progress event, as WebKit checks
   // consecutive bytesLoaded() to see if any progress made.
   // See HTMLMediaElement::progressEventTimerFired.
   // TODO(qinmin): need a method to calculate the buffered bytes.
   buffered_bytes_++;
 }
 
 void WebMediaPlayerAndroid::OnSeekComplete() {
   seeking_ = false;
 
@@ skipping 93 matching lines @@
 
 WebVideoFrame* WebMediaPlayerAndroid::getCurrentFrame() {
   return video_frame_.get();
 }
 
 void WebMediaPlayerAndroid::putCurrentFrame(
     WebVideoFrame* web_video_frame) {
 }
 
 }  // namespace webkit_media