| Index: webkit/glue/webmediaplayer_impl.h
|
| diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
|
| index 604188c8e3cd46d1b25795682572a74eba09f0cd..b8a44b078d1af3e96081f3bbcf3a66c2d95c015f 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_;
|
|
|
|
|