diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-02 00:41:58 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-02 00:41:58 +0000 |
| commit | 04671d7392ef0e1b86c76cd9c81803e87c639ca8 (patch) | |
| tree | a0904a0b0db9c76877cc2c3891178d7d78204e61 /media/tools | |
| parent | 5dde2cd324cc57769bfed38eb95fc5267a8a8a16 (diff) | |
| download | chromium_src-04671d7392ef0e1b86c76cd9c81803e87c639ca8.zip chromium_src-04671d7392ef0e1b86c76cd9c81803e87c639ca8.tar.gz chromium_src-04671d7392ef0e1b86c76cd9c81803e87c639ca8.tar.bz2 | |
Revert "Revert 285479 "Make DataSource::Stop() synchronous.""
This reverts commit aca48d3efdf5ba8a891d6f139fd8ba8db8d69fc2.
The original CL didn't cause issue 397656. It's caused by previous CLs and is
fixed by r286787. This CL simply reland the original CL.
TBR=gbillock@chromium.org
BUG=349211, 397656
TEST=Existing tests pass.
Review URL: https://codereview.chromium.org/435023002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_x11/data_source_logger.cc | 11 | ||||
| -rw-r--r-- | media/tools/player_x11/data_source_logger.h | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/media/tools/player_x11/data_source_logger.cc b/media/tools/player_x11/data_source_logger.cc index 204d8b3..d09b6bf 100644 --- a/media/tools/player_x11/data_source_logger.cc +++ b/media/tools/player_x11/data_source_logger.cc @@ -6,11 +6,6 @@ #include "base/logging.h" #include "media/tools/player_x11/data_source_logger.h" -static void LogAndRunStopClosure(const base::Closure& closure) { - VLOG(1) << "Stop() finished"; - closure.Run(); -} - static void LogAndRunReadCB( int64 position, int size, const media::DataSource::ReadCB& read_cb, int result) { @@ -25,9 +20,9 @@ DataSourceLogger::DataSourceLogger( streaming_(streaming) { } -void DataSourceLogger::Stop(const base::Closure& closure) { - VLOG(1) << "Stop() started"; - data_source_->Stop(base::Bind(&LogAndRunStopClosure, closure)); +void DataSourceLogger::Stop() { + VLOG(1) << "Stop()"; + data_source_->Stop(); } void DataSourceLogger::Read( diff --git a/media/tools/player_x11/data_source_logger.h b/media/tools/player_x11/data_source_logger.h index 5fdd9d4..1cb0a80 100644 --- a/media/tools/player_x11/data_source_logger.h +++ b/media/tools/player_x11/data_source_logger.h @@ -22,7 +22,7 @@ class DataSourceLogger : public media::DataSource { virtual ~DataSourceLogger(); // media::DataSource implementation. - virtual void Stop(const base::Closure& closure) OVERRIDE; + virtual void Stop() OVERRIDE; virtual void Read( int64 position, int size, uint8* data, const media::DataSource::ReadCB& read_cb) OVERRIDE; |