diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-18 03:37:43 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-18 03:37:43 +0000 |
| commit | a564815aed4c8bd1e2c187f9024320f8bb3d3379 (patch) | |
| tree | 21a3875638d117250721085a589df2bb911d8081 /webkit/glue | |
| parent | ab8295896cfd8e05655da45c85716edb104752fc (diff) | |
| download | chromium_src-a564815aed4c8bd1e2c187f9024320f8bb3d3379.zip chromium_src-a564815aed4c8bd1e2c187f9024320f8bb3d3379.tar.gz chromium_src-a564815aed4c8bd1e2c187f9024320f8bb3d3379.tar.bz2 | |
Added reference counting to the Pipeline interface.
BUG=17107
TEST=none
Review URL: http://codereview.chromium.org/155713
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index fad8825..d8bad19 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -139,7 +139,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client, if (!pipeline_thread_.Start()) { NOTREACHED() << "Could not start PipelineThread"; } else { - pipeline_.reset(new media::PipelineImpl(pipeline_thread_.message_loop())); + pipeline_ = new media::PipelineImpl(pipeline_thread_.message_loop()); } // Also we want to be notified of |main_loop_| destruction. diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h index 5904023..3972653 100644 --- a/webkit/glue/webmediaplayer_impl.h +++ b/webkit/glue/webmediaplayer_impl.h @@ -237,7 +237,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, scoped_refptr<media::FilterFactoryCollection> filter_factory_; // The actual pipeline and the thread it runs on. - scoped_ptr<media::PipelineImpl> pipeline_; + scoped_refptr<media::PipelineImpl> pipeline_; base::Thread pipeline_thread_; // Playback state. |