diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 05:40:13 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 05:40:13 +0000 |
commit | 9e166974e33f359467458af13987c3d87663c163 (patch) | |
tree | 63ddfaa99458d1d06b120ec99383f6ff814933da /webkit/glue/webmediaplayer_impl.h | |
parent | bcc26067bf9a0bb7fe1600119a5b034b36b86da4 (diff) | |
download | chromium_src-9e166974e33f359467458af13987c3d87663c163.zip chromium_src-9e166974e33f359467458af13987c3d87663c163.tar.gz chromium_src-9e166974e33f359467458af13987c3d87663c163.tar.bz2 |
Move MediaFilterCollection code into a class.
Refactored FilterType usage a bit to remove the need to manually associate
FilterType values to filter base classes.
Patch by acolwell@chromium.org:
http://codereview.chromium.org/4176006/show
BUG=60778
TEST=media_unittests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.h')
-rw-r--r-- | webkit/glue/webmediaplayer_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h index f1860f4..23f4148 100644 --- a/webkit/glue/webmediaplayer_impl.h +++ b/webkit/glue/webmediaplayer_impl.h @@ -169,7 +169,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, // |collection| before calling this method. // WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client, - const media::MediaFilterCollection& collection, + media::MediaFilterCollection* collection, MediaResourceLoaderBridgeFactory* bridge_factory_simple, MediaResourceLoaderBridgeFactory* bridge_factory_buffered, bool use_simple_data_source, @@ -280,7 +280,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, MessageLoop* main_loop_; // A collection of filters. - media::MediaFilterCollection filter_collection_; + scoped_ptr<media::MediaFilterCollection> filter_collection_; // The actual pipeline and the thread it runs on. scoped_refptr<media::PipelineImpl> pipeline_; |