diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 17:43:28 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 17:43:28 +0000 |
| commit | 145cfa4bfe1c8df34331c5c4c928fb168ceec67a (patch) | |
| tree | 3a08e6fa7a05ff3c576d071df2f6a5b7c3a1b7ba /webkit/media | |
| parent | 36113e8ec4bf4a0c2ab19dac9ccd38f8c777a7b0 (diff) | |
| download | chromium_src-145cfa4bfe1c8df34331c5c4c928fb168ceec67a.zip chromium_src-145cfa4bfe1c8df34331c5c4c928fb168ceec67a.tar.gz chromium_src-145cfa4bfe1c8df34331c5c4c928fb168ceec67a.tar.bz2 | |
Remove reference counting from media::Pipeline.
BUG=173313
R=acolwell@chromium.org
Review URL: https://codereview.chromium.org/14371023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 5 | ||||
| -rw-r--r-- | webkit/media/webmediaplayer_impl.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index 614c898..6a95ea9 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -151,8 +151,8 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); CHECK(media_thread_.Start()); - pipeline_ = new media::Pipeline( - media_thread_.message_loop_proxy(), media_log_); + pipeline_.reset(new media::Pipeline( + media_thread_.message_loop_proxy(), media_log_)); // Let V8 know we started new thread if we did not do it yet. // Made separate task to avoid deletion of player currently being created. @@ -1213,6 +1213,7 @@ void WebMediaPlayerImpl::Destroy() { media_thread_.Stop(); // Release any final references now that everything has stopped. + pipeline_.reset(); demuxer_.reset(); data_source_.reset(); } diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h index c9f27c5..3772a8b 100644 --- a/webkit/media/webmediaplayer_impl.h +++ b/webkit/media/webmediaplayer_impl.h @@ -279,7 +279,7 @@ class WebMediaPlayerImpl // for DCHECKs so methods calls won't execute in the wrong thread. const scoped_refptr<base::MessageLoopProxy> main_loop_; - scoped_refptr<media::Pipeline> pipeline_; + scoped_ptr<media::Pipeline> pipeline_; base::Thread media_thread_; // The currently selected key system. Empty string means that no key system |