diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 20:33:54 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 20:33:54 +0000 |
| commit | 86ea7b1013fc49cbdd6a0b7516f9b4faecd6b57a (patch) | |
| tree | 310a37ca44d6cab7e1e456c5b00d535c93111c92 /webkit | |
| parent | 32f497b982637006871eb3e32313a079909c7757 (diff) | |
| download | chromium_src-86ea7b1013fc49cbdd6a0b7516f9b4faecd6b57a.zip chromium_src-86ea7b1013fc49cbdd6a0b7516f9b4faecd6b57a.tar.gz chromium_src-86ea7b1013fc49cbdd6a0b7516f9b4faecd6b57a.tar.bz2 | |
Fold Pipeline::Init() into Pipeline::Start().
Instead of having clients optionally call Init() (i.e., player_x11, player_wtl) they are forced to pass null callbacks into Start().
Review URL: https://chromiumcodereview.appspot.com/9269022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index 011e630..da28423 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -128,13 +128,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( message_loop_factory_->GetMessageLoop("PipelineThread"); CHECK(pipeline_message_loop) << "Failed to create a new thread"; pipeline_ = new media::Pipeline(pipeline_message_loop, media_log_); - pipeline_->Init( - base::Bind(&WebMediaPlayerProxy::PipelineEndedCallback, - proxy_.get()), - base::Bind(&WebMediaPlayerProxy::PipelineErrorCallback, - proxy_.get()), - base::Bind(&WebMediaPlayerProxy::NetworkEventCallback, - proxy_.get())); // Let V8 know we started new thread if we did not did it yet. // Made separate task to avoid deletion of player currently being created. @@ -837,6 +830,9 @@ void WebMediaPlayerImpl::StartPipeline(const GURL& gurl) { pipeline_->Start( filter_collection_.Pass(), gurl.spec(), + base::Bind(&WebMediaPlayerProxy::PipelineEndedCallback, proxy_.get()), + base::Bind(&WebMediaPlayerProxy::PipelineErrorCallback, proxy_.get()), + base::Bind(&WebMediaPlayerProxy::NetworkEventCallback, proxy_.get()), base::Bind(&WebMediaPlayerProxy::PipelineInitializationCallback, proxy_.get())); } |