summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 19:09:50 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 19:09:50 +0000
commit0d5723514504d5dcc68c7c9a45f543ec7c5fcee9 (patch)
treeef2bb5229e93c58e1c76af3a32a97e22a0ac2db4 /media
parentacbb8b1db5e74ff4d038d2e12d619f5ae71dd120 (diff)
downloadchromium_src-0d5723514504d5dcc68c7c9a45f543ec7c5fcee9.zip
chromium_src-0d5723514504d5dcc68c7c9a45f543ec7c5fcee9.tar.gz
chromium_src-0d5723514504d5dcc68c7c9a45f543ec7c5fcee9.tar.bz2
Remove Clone() from DataSourceFactory & DemuxerFactory since the methods aren't used anywhere.
TEST=None Review URL: http://codereview.chromium.org/9198002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/async_filter_factory_base.cc7
-rw-r--r--media/base/async_filter_factory_base.h7
-rw-r--r--media/base/composite_data_source_factory.cc13
-rw-r--r--media/base/composite_data_source_factory.h3
-rw-r--r--media/base/filter_factories.h10
-rw-r--r--media/base/mock_filters.cc4
-rw-r--r--media/base/mock_filters.h1
-rw-r--r--media/filters/chunk_demuxer_factory.cc5
-rw-r--r--media/filters/chunk_demuxer_factory.h1
-rw-r--r--media/filters/dummy_demuxer_factory.cc5
-rw-r--r--media/filters/dummy_demuxer_factory.h1
-rw-r--r--media/filters/ffmpeg_demuxer_factory.cc5
-rw-r--r--media/filters/ffmpeg_demuxer_factory.h1
-rw-r--r--media/filters/file_data_source_factory.cc4
-rw-r--r--media/filters/file_data_source_factory.h1
15 files changed, 4 insertions, 64 deletions
diff --git a/media/base/async_filter_factory_base.cc b/media/base/async_filter_factory_base.cc
index b37f619..464f3b8 100644
--- a/media/base/async_filter_factory_base.cc
+++ b/media/base/async_filter_factory_base.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -54,7 +54,7 @@ void AsyncDataSourceFactoryBase::ReportError(
DCHECK_NE(error, PIPELINE_OK);
DCHECK(!callback.is_null());
- callback.Run(error, static_cast<DataSource*>(NULL));
+ callback.Run(error, NULL);
}
void AsyncDataSourceFactoryBase::BuildRequestDone(BuildRequest* request) {
@@ -84,8 +84,7 @@ void AsyncDataSourceFactoryBase::BuildRequest::Start(
}
void AsyncDataSourceFactoryBase::BuildRequest::RequestComplete(
- PipelineStatus status,
- DataSource* data_source) {
+ PipelineStatus status, DataSource* data_source) {
DCHECK(!callback_.is_null());
DCHECK(!done_callback_.is_null());
diff --git a/media/base/async_filter_factory_base.h b/media/base/async_filter_factory_base.h
index 4a9200e..87b4b3e 100644
--- a/media/base/async_filter_factory_base.h
+++ b/media/base/async_filter_factory_base.h
@@ -57,13 +57,6 @@ class MEDIA_EXPORT AsyncDataSourceFactoryBase : public DataSourceFactory {
virtual void Build(const std::string& url,
const BuildCallback& callback) OVERRIDE;
- // DataSourceFactory method.
- // Clone() must be implemented by derived classes.
- // NOTE: Nothing in this base class needs to be cloned because this class
- // only keeps track of pending requests, which are not part of the cloning
- // process.
- virtual scoped_ptr<DataSourceFactory> Clone() const = 0;
-
protected:
class MEDIA_EXPORT BuildRequest {
public:
diff --git a/media/base/composite_data_source_factory.cc b/media/base/composite_data_source_factory.cc
index c4c15e4..e91415f 100644
--- a/media/base/composite_data_source_factory.cc
+++ b/media/base/composite_data_source_factory.cc
@@ -41,19 +41,6 @@ void CompositeDataSourceFactory::AddFactory(
factories_.push_back(factory.release());
}
-scoped_ptr<DataSourceFactory> CompositeDataSourceFactory::Clone() const {
- scoped_ptr<CompositeDataSourceFactory> new_factory(
- new CompositeDataSourceFactory());
-
- for (FactoryList::const_iterator itr = factories_.begin();
- itr != factories_.end();
- ++itr) {
- new_factory->AddFactory((*itr)->Clone().Pass());
- }
-
- return scoped_ptr<DataSourceFactory>(new_factory.release());
-}
-
bool CompositeDataSourceFactory::AllowRequests() const {
return !factories_.empty();
}
diff --git a/media/base/composite_data_source_factory.h b/media/base/composite_data_source_factory.h
index 0118ce5..54f6387 100644
--- a/media/base/composite_data_source_factory.h
+++ b/media/base/composite_data_source_factory.h
@@ -22,9 +22,6 @@ class MEDIA_EXPORT CompositeDataSourceFactory
// Add factory to this composite.
void AddFactory(scoped_ptr<DataSourceFactory> factory);
- // DataSourceFactory method.
- virtual scoped_ptr<DataSourceFactory> Clone() const OVERRIDE;
-
protected:
// AsyncDataSourceFactoryBase methods.
virtual bool AllowRequests() const OVERRIDE;
diff --git a/media/base/filter_factories.h b/media/base/filter_factories.h
index 6158ff4..0e004ef 100644
--- a/media/base/filter_factories.h
+++ b/media/base/filter_factories.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_FILTER_FACTORIES_H_
#define MEDIA_BASE_FILTER_FACTORIES_H_
-#include<string>
+#include <string>
#include "base/callback.h"
#include "media/base/media_export.h"
@@ -25,10 +25,6 @@ class MEDIA_EXPORT DataSourceFactory {
// Builds a DataSource for |url| and returns it via |callback|.
virtual void Build(const std::string& url, const BuildCallback& callback) = 0;
-
- // Makes a copy of this factory.
- // NOTE: Pending requests are not cloned.
- virtual scoped_ptr<DataSourceFactory> Clone() const = 0;
};
class Demuxer;
@@ -43,10 +39,6 @@ class MEDIA_EXPORT DemuxerFactory {
// Builds a Demuxer for |url| and returns it via |callback|.
virtual void Build(const std::string& url, const BuildCallback& callback) = 0;
-
- // Makes a copy of this factory.
- // NOTE: Pending requests are not cloned.
- virtual scoped_ptr<DemuxerFactory> Clone() const = 0;
};
} // namespace media
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
index 32e9efc..298892a 100644
--- a/media/base/mock_filters.cc
+++ b/media/base/mock_filters.cc
@@ -66,10 +66,6 @@ void MockDemuxerFactory::RunBuildCallback(const std::string& url,
callback.Run(status_, NULL);
}
-scoped_ptr<DemuxerFactory> MockDemuxerFactory::Clone() const {
- return scoped_ptr<DemuxerFactory>(new MockDemuxerFactory(demuxer_.get()));
-}
-
MockDemuxer::MockDemuxer()
: total_bytes_(-1), buffered_bytes_(-1), duration_() {}
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 22a0ce59..6ccbc32 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -148,7 +148,6 @@ class MockDemuxerFactory : public DemuxerFactory {
// DemuxerFactory methods.
MOCK_METHOD2(Build, void(const std::string& url,
const BuildCallback& callback));
- virtual scoped_ptr<DemuxerFactory> Clone() const;
private:
scoped_refptr<MockDemuxer> demuxer_;
diff --git a/media/filters/chunk_demuxer_factory.cc b/media/filters/chunk_demuxer_factory.cc
index aa37221..a441cf7 100644
--- a/media/filters/chunk_demuxer_factory.cc
+++ b/media/filters/chunk_demuxer_factory.cc
@@ -46,9 +46,4 @@ void ChunkDemuxerFactory::Build(const std::string& url,
demuxer->Init(base::Bind(&InitDone, MessageLoop::current(), cb, demuxer));
}
-scoped_ptr<DemuxerFactory> ChunkDemuxerFactory::Clone() const {
- return scoped_ptr<DemuxerFactory>(new ChunkDemuxerFactory(
- url_, delegate_factory_->Clone().Pass(), client_));
-}
-
} // namespace media
diff --git a/media/filters/chunk_demuxer_factory.h b/media/filters/chunk_demuxer_factory.h
index 9b9b824..7a3c9fc 100644
--- a/media/filters/chunk_demuxer_factory.h
+++ b/media/filters/chunk_demuxer_factory.h
@@ -29,7 +29,6 @@ class MEDIA_EXPORT ChunkDemuxerFactory : public DemuxerFactory {
// DemuxerFactory methods.
virtual void Build(const std::string& url, const BuildCallback& cb) OVERRIDE;
- virtual scoped_ptr<DemuxerFactory> Clone() const OVERRIDE;
private:
std::string url_;
diff --git a/media/filters/dummy_demuxer_factory.cc b/media/filters/dummy_demuxer_factory.cc
index e1e924a..34b79ba 100644
--- a/media/filters/dummy_demuxer_factory.cc
+++ b/media/filters/dummy_demuxer_factory.cc
@@ -26,9 +26,4 @@ void DummyDemuxerFactory::Build(const std::string& url,
cb.Run(PIPELINE_OK, demuxer.get());
}
-scoped_ptr<DemuxerFactory> DummyDemuxerFactory::Clone() const {
- return scoped_ptr<DemuxerFactory>(
- new DummyDemuxerFactory(has_video_, has_audio_, local_source_));
-}
-
} // namespace media
diff --git a/media/filters/dummy_demuxer_factory.h b/media/filters/dummy_demuxer_factory.h
index 64e359a..266314c 100644
--- a/media/filters/dummy_demuxer_factory.h
+++ b/media/filters/dummy_demuxer_factory.h
@@ -19,7 +19,6 @@ class MEDIA_EXPORT DummyDemuxerFactory : public DemuxerFactory {
// DemuxerFactory methods.
virtual void Build(const std::string& url, const BuildCallback& cb) OVERRIDE;
- virtual scoped_ptr<DemuxerFactory> Clone() const OVERRIDE;
private:
bool has_video_;
diff --git a/media/filters/ffmpeg_demuxer_factory.cc b/media/filters/ffmpeg_demuxer_factory.cc
index 439c9d8..414c165 100644
--- a/media/filters/ffmpeg_demuxer_factory.cc
+++ b/media/filters/ffmpeg_demuxer_factory.cc
@@ -52,9 +52,4 @@ void FFmpegDemuxerFactory::Build(const std::string& url,
cb, loop_, local_source));
}
-scoped_ptr<DemuxerFactory> FFmpegDemuxerFactory::Clone() const {
- return scoped_ptr<DemuxerFactory>(
- new FFmpegDemuxerFactory(data_source_factory_->Clone(), loop_));
-}
-
} // namespace media
diff --git a/media/filters/ffmpeg_demuxer_factory.h b/media/filters/ffmpeg_demuxer_factory.h
index a93f512..f35e5d5 100644
--- a/media/filters/ffmpeg_demuxer_factory.h
+++ b/media/filters/ffmpeg_demuxer_factory.h
@@ -23,7 +23,6 @@ class MEDIA_EXPORT FFmpegDemuxerFactory : public DemuxerFactory {
// DemuxerFactory methods.
virtual void Build(const std::string& url, const BuildCallback& cb) OVERRIDE;
- virtual scoped_ptr<DemuxerFactory> Clone() const OVERRIDE;
private:
scoped_ptr<DataSourceFactory> data_source_factory_;
diff --git a/media/filters/file_data_source_factory.cc b/media/filters/file_data_source_factory.cc
index 48b917b..39b07f6 100644
--- a/media/filters/file_data_source_factory.cc
+++ b/media/filters/file_data_source_factory.cc
@@ -31,8 +31,4 @@ void FileDataSourceFactory::Build(const std::string& url,
callback.Run(status, data_source);
}
-scoped_ptr<DataSourceFactory> FileDataSourceFactory::Clone() const {
- return scoped_ptr<DataSourceFactory>(new FileDataSourceFactory());
-}
-
} // namespace media
diff --git a/media/filters/file_data_source_factory.h b/media/filters/file_data_source_factory.h
index f6328ae..af15a1f 100644
--- a/media/filters/file_data_source_factory.h
+++ b/media/filters/file_data_source_factory.h
@@ -17,7 +17,6 @@ class MEDIA_EXPORT FileDataSourceFactory : public DataSourceFactory {
// DataSourceFactory methods.
virtual void Build(const std::string& url,
const BuildCallback& callback) OVERRIDE;
- virtual scoped_ptr<DataSourceFactory> Clone() const OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(FileDataSourceFactory);
generated by cgit v1.1 at 2025-03-30 23:08:33 +0000