diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 04:36:51 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 04:36:51 +0000 |
| commit | ddaaf850992ef0aad89b36f717fc964bf6628831 (patch) | |
| tree | 9823079636ef8d8281ba872ca1ae92cc80436a77 /chrome/utility | |
| parent | 6affe2cbd65afa59872ab163b1b77e143140d5bb (diff) | |
| download | chromium_src-ddaaf850992ef0aad89b36f717fc964bf6628831.zip chromium_src-ddaaf850992ef0aad89b36f717fc964bf6628831.tar.gz chromium_src-ddaaf850992ef0aad89b36f717fc964bf6628831.tar.bz2 | |
Make DataSource::Stop() synchronous.
In a lot of filters in media code, Stop() has been folded into the dtor.
This model doesn't apply directly to DataSource because DataSource::Stop()
is called by the FFmpegDemuxer, but the DataSource is owned by
WebMediaPlayerImpl.
TBR=gbillock@chromium.org
BUG=349211
TEST=All existing tests pass.
Review URL: https://codereview.chromium.org/413243002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility')
| -rw-r--r-- | chrome/utility/media_galleries/ipc_data_source.cc | 3 | ||||
| -rw-r--r-- | chrome/utility/media_galleries/ipc_data_source.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/utility/media_galleries/ipc_data_source.cc b/chrome/utility/media_galleries/ipc_data_source.cc index c44670a..c65a898 100644 --- a/chrome/utility/media_galleries/ipc_data_source.cc +++ b/chrome/utility/media_galleries/ipc_data_source.cc @@ -21,9 +21,8 @@ IPCDataSource::~IPCDataSource() { DCHECK(utility_thread_checker_.CalledOnValidThread()); } -void IPCDataSource::Stop(const base::Closure& callback) { +void IPCDataSource::Stop() { DCHECK(data_source_thread_checker_.CalledOnValidThread()); - callback.Run(); } void IPCDataSource::Read(int64 position, int size, uint8* data, diff --git a/chrome/utility/media_galleries/ipc_data_source.h b/chrome/utility/media_galleries/ipc_data_source.h index c65c457..6fb3b76 100644 --- a/chrome/utility/media_galleries/ipc_data_source.h +++ b/chrome/utility/media_galleries/ipc_data_source.h @@ -32,7 +32,7 @@ class IPCDataSource: public media::DataSource, // Implementation of DataSource. These methods may be called on any single // thread. First usage of these methods attaches a thread checker. - virtual void Stop(const base::Closure& callback) OVERRIDE; + virtual void Stop() OVERRIDE; virtual void Read(int64 position, int size, uint8* data, const ReadCB& read_cb) OVERRIDE; virtual bool GetSize(int64* size_out) OVERRIDE; |