summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webmediaplayer_impl.h
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 00:27:49 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 00:27:49 +0000
commitf8db8138e0bf38e223af520e721f1b18c2338586 (patch)
treefed715fb20dd16998c16ca54b4c7da7ae94372f1 /webkit/glue/webmediaplayer_impl.h
parent1937df51d1bdcabbad5523243108d4bba40a1695 (diff)
downloadchromium_src-f8db8138e0bf38e223af520e721f1b18c2338586.zip
chromium_src-f8db8138e0bf38e223af520e721f1b18c2338586.tar.gz
chromium_src-f8db8138e0bf38e223af520e721f1b18c2338586.tar.bz2
Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5527003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.h')
-rw-r--r--webkit/glue/webmediaplayer_impl.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index da08c4a4..d1f73a0 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -95,12 +95,12 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
Proxy(MessageLoop* render_loop,
WebMediaPlayerImpl* webmediaplayer);
- // Methods for MediaFilter -> WebMediaPlayerImpl communication.
+ // Methods for Filter -> WebMediaPlayerImpl communication.
void Repaint();
void SetVideoRenderer(scoped_refptr<WebVideoRenderer> video_renderer);
void SetDataSource(scoped_refptr<WebDataSource> data_source);
- // Methods for WebMediaPlayerImpl -> MediaFilter communication.
+ // Methods for WebMediaPlayerImpl -> Filter communication.
void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& dest_rect);
void SetSize(const gfx::Rect& rect);
void Detach();
@@ -175,7 +175,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
//
// Callers must call |Initialize()| before they can use the object.
WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client,
- media::MediaFilterCollection* collection);
+ media::FilterCollection* collection);
virtual ~WebMediaPlayerImpl();
// Finalizes initialization of the object.
@@ -288,7 +288,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
MessageLoop* main_loop_;
// A collection of filters.
- scoped_ptr<media::MediaFilterCollection> filter_collection_;
+ scoped_ptr<media::FilterCollection> filter_collection_;
// The actual pipeline and the thread it runs on.
scoped_refptr<media::Pipeline> pipeline_;