diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-11 00:16:19 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-11 00:16:19 +0000 |
| commit | 3b4cbbfd3d8c8f5eb703560828c8fa25524819ea (patch) | |
| tree | c3864dcf6b0eef6413eceec1fd04d4fee4a86511 /webkit/glue/webmediaplayer_impl.h | |
| parent | 24893327f0f72295fbdcd5ac672ff7a8920d7876 (diff) | |
| download | chromium_src-3b4cbbfd3d8c8f5eb703560828c8fa25524819ea.zip chromium_src-3b4cbbfd3d8c8f5eb703560828c8fa25524819ea.tar.gz chromium_src-3b4cbbfd3d8c8f5eb703560828c8fa25524819ea.tar.bz2 | |
Unreverting "Implemented injected message loops for PipelineImpl"
Guess it was a flaky layout test.
TBR=hclam
Review URL: http://codereview.chromium.org/155400
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.h')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.h | 6 |
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_; |