summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webmediaplayer_impl.h
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 21:07:27 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 21:07:27 +0000
commit1fd4075a6d185ba580373b58a6de5e62c41f6c96 (patch)
treec517902e1b16ac391f7a213bb6c9bdeff9442c7d /webkit/glue/webmediaplayer_impl.h
parent4cdbad1fd0f03fc0db25955acacab5e0d9e8f5c4 (diff)
downloadchromium_src-1fd4075a6d185ba580373b58a6de5e62c41f6c96.zip
chromium_src-1fd4075a6d185ba580373b58a6de5e62c41f6c96.tar.gz
chromium_src-1fd4075a6d185ba580373b58a6de5e62c41f6c96.tar.bz2
Implemented injected message loops for PipelineImpl.
For now both the player and WebMediaPlayerImpl create a thread and inject its message loop into the pipeline. The end result is more-or-less the same as what we have today, but we could end up moving the pipeline onto the render thread. BUG=16008 TEST=layout tests, media_unittests should pass Review URL: http://codereview.chromium.org/155338 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.h')
-rw-r--r--webkit/glue/webmediaplayer_impl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index 604188c..b8a44b0 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -248,9 +248,9 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
// A collection of factories for creating filters.
scoped_refptr<media::FilterFactoryCollection> filter_factory_;
- // The actual pipeline. We do it a composition here because we expect to have
- // the same lifetime as the pipeline.
- media::PipelineImpl pipeline_;
+ // The actual pipeline and the thread it runs on.
+ scoped_ptr<media::PipelineImpl> pipeline_;
+ base::Thread pipeline_thread_;
WebKit::WebMediaPlayerClient* client_;