| Index: webkit/glue/webmediaplayer_impl.cc
|
| diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
|
| index 49d29e055479e21cf26cc29c9fc8e4683553c6ee..3b1b298e8462f8e1682323b7005b737d733521f3 100644
|
| --- a/webkit/glue/webmediaplayer_impl.cc
|
| +++ b/webkit/glue/webmediaplayer_impl.cc
|
| @@ -368,7 +368,7 @@ bool WebMediaPlayerImpl::seeking() const {
|
|
|
| if (ready_state_ == WebKit::WebMediaPlayer::HaveNothing)
|
| return false;
|
| -
|
| +
|
| return ready_state_ == WebKit::WebMediaPlayer::HaveMetadata;
|
| }
|
|
|
| @@ -391,10 +391,10 @@ int WebMediaPlayerImpl::dataRate() const {
|
| return 0;
|
| }
|
|
|
| -float WebMediaPlayerImpl::maxTimeBuffered() const {
|
| +const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() const {
|
| DCHECK(MessageLoop::current() == main_loop_);
|
|
|
| - return static_cast<float>(pipeline_->GetBufferedTime().InSecondsF());
|
| + return buffered_;
|
| }
|
|
|
| float WebMediaPlayerImpl::maxTimeSeekable() const {
|
| @@ -471,6 +471,12 @@ void WebMediaPlayerImpl::Repaint() {
|
| void WebMediaPlayerImpl::OnPipelineInitialize() {
|
| DCHECK(MessageLoop::current() == main_loop_);
|
| if (pipeline_->GetError() == media::PIPELINE_OK) {
|
| + // Only keep one time range starting from 0.
|
| + buffered_.push_back(
|
| + WebKit::WebTimeRange(
|
| + 0.0f,
|
| + static_cast<float>(pipeline_->GetBufferedTime().InSecondsF())));
|
| +
|
| // Since we have initialized the pipeline, say we have everything.
|
| // TODO(hclam): change this to report the correct status.
|
| SetReadyState(WebKit::WebMediaPlayer::HaveMetadata);
|
|
|