diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 17:47:15 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 17:47:15 +0000 |
| commit | 583634b8cb62af00593258b64680bf6b2358d43d (patch) | |
| tree | ff7976bb94f6a607c919293045169c3f235d2fd9 /webkit/glue/webmediaplayer_impl.h | |
| parent | dcf6c130ddd91d3349ec503203ea89d1600f2462 (diff) | |
| download | chromium_src-583634b8cb62af00593258b64680bf6b2358d43d.zip chromium_src-583634b8cb62af00593258b64680bf6b2358d43d.tar.gz chromium_src-583634b8cb62af00593258b64680bf6b2358d43d.tar.bz2 | |
Refactor Pipeline & PipelineImpl so WebMediaPlayerImpl references a Pipeline instead of PipelineImpl
BUG=54110
TEST=PipelineImplTest
Review URL: http://codereview.chromium.org/4664005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.h')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h index 23f4148..9361020 100644 --- a/webkit/glue/webmediaplayer_impl.h +++ b/webkit/glue/webmediaplayer_impl.h @@ -57,11 +57,12 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "base/thread.h" #include "base/waitable_event.h" #include "gfx/rect.h" #include "gfx/size.h" #include "media/base/filters.h" -#include "media/base/pipeline_impl.h" +#include "media/base/pipeline.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h" #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h" @@ -283,7 +284,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, scoped_ptr<media::MediaFilterCollection> filter_collection_; // The actual pipeline and the thread it runs on. - scoped_refptr<media::PipelineImpl> pipeline_; + scoped_refptr<media::Pipeline> pipeline_; base::Thread pipeline_thread_; // Playback state. |