diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 03:03:07 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 03:03:07 +0000 |
| commit | 64d3d791df850a8ed083febcdf8170b1e8d0bbe5 (patch) | |
| tree | a2efb38fee8357a5c80dd2f6d98ffbe1dfe2078f /webkit/glue/webmediaplayer_impl.cc | |
| parent | a1c2aef665b4abc30bbd6e2f8af5d5e68fc49eb4 (diff) | |
| download | chromium_src-64d3d791df850a8ed083febcdf8170b1e8d0bbe5.zip chromium_src-64d3d791df850a8ed083febcdf8170b1e8d0bbe5.tar.gz chromium_src-64d3d791df850a8ed083febcdf8170b1e8d0bbe5.tar.bz2 | |
Don't forcibly set our network state to NETWORK_LOADING after media initializes.
We already set the network state to NETWORK_LOADING before we kick off initialization. Furthermore, we may end up caching the entire media resource and set our network state to NETWORK_IDLE in which case we really don't want to switch back to NETWORK_LOADING.
BUG=25185
TEST=covered by layout tests
Review URL: http://codereview.chromium.org/1518013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index c85d6d0..41c76f7 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -575,14 +575,13 @@ void WebMediaPlayerImpl::OnPipelineInitialize() { static_cast<float>(pipeline_->GetDuration().InSecondsF()); buffered_.swap(new_buffered); - // Since we have initialized the pipeline, say we have everything. + // Since we have initialized the pipeline, say we have everything otherwise + // we'll remain either loading/idle. // TODO(hclam): change this to report the correct status. SetReadyState(WebKit::WebMediaPlayer::HaveMetadata); SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData); if (pipeline_->IsLoaded()) { SetNetworkState(WebKit::WebMediaPlayer::Loaded); - } else { - SetNetworkState(WebKit::WebMediaPlayer::Loading); } } else { // TODO(hclam): should use pipeline_->GetError() to determine the state |