summaryrefslogtreecommitdiffstats
path: root/webkit/glue/media
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/media
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/media')
-rw-r--r--webkit/glue/media/buffered_data_source.cc2
-rw-r--r--webkit/glue/media/buffered_data_source.h3
-rw-r--r--webkit/glue/media/simple_data_source.h4
3 files changed, 4 insertions, 5 deletions
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index 75fbe5b..a82ce87 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -651,7 +651,7 @@ base::TimeDelta BufferedDataSource::GetTimeoutMilliseconds() {
}
/////////////////////////////////////////////////////////////////////////////
-// BufferedDataSource, media::MediaFilter implementation
+// BufferedDataSource, media::Filter implementation
void BufferedDataSource::Initialize(const std::string& url,
media::FilterCallback* callback) {
// Saves the url.
diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h
index 674d5f4..f1002cd 100644
--- a/webkit/glue/media/buffered_data_source.h
+++ b/webkit/glue/media/buffered_data_source.h
@@ -256,7 +256,7 @@ class BufferedDataSource : public WebDataSource {
virtual ~BufferedDataSource();
- // media::MediaFilter implementation.
+ // media::Filter implementation.
virtual void Initialize(const std::string& url,
media::FilterCallback* callback);
virtual bool IsUrlSupported(const std::string& url);
@@ -280,7 +280,6 @@ class BufferedDataSource : public WebDataSource {
virtual void Abort();
protected:
-
// A factory method to create a BufferedResourceLoader based on the read
// parameters. We can override this file to object a mock
// BufferedResourceLoader for testing.
diff --git a/webkit/glue/media/simple_data_source.h b/webkit/glue/media/simple_data_source.h
index 4cfc989..f4c83e6 100644
--- a/webkit/glue/media/simple_data_source.h
+++ b/webkit/glue/media/simple_data_source.h
@@ -34,10 +34,10 @@ class SimpleDataSource : public WebDataSource,
SimpleDataSource(MessageLoop* render_loop, WebKit::WebFrame* frame);
virtual ~SimpleDataSource();
- // MediaFilter implementation.
+ // media::Filter implementation.
virtual void Stop(media::FilterCallback* callback);
- // DataSource implementation.
+ // media::DataSource implementation.
virtual void Initialize(const std::string& url,
media::FilterCallback* callback);
virtual const media::MediaFormat& media_format();