From 69a06d386389e6ebb7f3cdaad3856a2eb67c977b Mon Sep 17 00:00:00 2001 From: "acolwell@chromium.org" Date: Tue, 5 Feb 2013 08:14:41 +0000 Subject: Fix maxTimeSeekable() so it returns 0 when the pipeline doesn't have a duration yet. BUG=173486 TEST=media/video-error-does-not-exist.html LayoutTest Review URL: https://chromiumcodereview.appspot.com/12185032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180643 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/media/webmediaplayer_impl.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'webkit') diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index fd7ede5..5948c1d 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -538,6 +538,11 @@ const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() { float WebMediaPlayerImpl::maxTimeSeekable() const { DCHECK_EQ(main_loop_, MessageLoop::current()); + // If we haven't even gotten to ReadyStateHaveMetadata yet then just + // return 0 so that the seekable range is empty. + if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata) + return 0.0f; + // We don't support seeking in streaming media. if (proxy_ && proxy_->data_source() && proxy_->data_source()->IsStreaming()) return 0.0f; -- cgit v1.1