summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webmediaplayer_impl.cc2
-rw-r--r--webkit/glue/webmediaplayer_impl.h2
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.