diff options
| author | wolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 03:22:32 +0000 |
|---|---|---|
| committer | wolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 03:22:32 +0000 |
| commit | 6954fe1ebf4fcf45e881e5ef1b09f5d0cb529b68 (patch) | |
| tree | de4fc69776b3308c57177ede4edef320352559e4 /webkit/media | |
| parent | a987e6153641b0463a3fa6fca129b227c4f29e71 (diff) | |
| download | chromium_src-6954fe1ebf4fcf45e881e5ef1b09f5d0cb529b68.zip chromium_src-6954fe1ebf4fcf45e881e5ef1b09f5d0cb529b68.tar.gz chromium_src-6954fe1ebf4fcf45e881e5ef1b09f5d0cb529b68.tar.bz2 | |
Change PipelineStatusCB to Closure for ended callbacks.
BUG=167109
TEST=All existing unit tests pass
Review URL: https://chromiumcodereview.appspot.com/11645052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/media/webmediaplayer_impl.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index a17cd0f..ded461a 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -925,12 +925,8 @@ void WebMediaPlayerImpl::OnPipelineSeek(PipelineStatus status) { GetClient()->timeChanged(); } -void WebMediaPlayerImpl::OnPipelineEnded(PipelineStatus status) { +void WebMediaPlayerImpl::OnPipelineEnded() { DCHECK_EQ(main_loop_, MessageLoop::current()); - if (status != media::PIPELINE_OK) { - OnPipelineError(status); - return; - } GetClient()->timeChanged(); } diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h index bb81c7c..16fba65 100644 --- a/webkit/media/webmediaplayer_impl.h +++ b/webkit/media/webmediaplayer_impl.h @@ -205,7 +205,7 @@ class WebMediaPlayerImpl void Repaint(); void OnPipelineSeek(media::PipelineStatus status); - void OnPipelineEnded(media::PipelineStatus status); + void OnPipelineEnded(); void OnPipelineError(media::PipelineStatus error); void OnPipelineBufferingState( media::Pipeline::BufferingState buffering_state); |