diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 10:44:56 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 10:44:56 +0000 |
| commit | 9441c059c32c4e2c921399197ccce1d0a0478471 (patch) | |
| tree | c9adb7562be8047dd4061e2abf3ff89862332ac0 /media/base/pipeline.cc | |
| parent | 2bd43e73f50f2b7eebd72186e76a9ec444d66dc1 (diff) | |
| download | chromium_src-9441c059c32c4e2c921399197ccce1d0a0478471.zip chromium_src-9441c059c32c4e2c921399197ccce1d0a0478471.tar.gz chromium_src-9441c059c32c4e2c921399197ccce1d0a0478471.tar.bz2 | |
Remove VideoDecoder::PrepareForShutdownHack() and friends.
As of r156011 the pause/flush/stop shutdown dance is no more. Now that Pipeline immediately calls Stop() during teardown we can remove a pile of hacks that were used to signal that teardown was starting.
BUG=110228
Review URL: https://chromiumcodereview.appspot.com/10918172
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156525 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline.cc')
| -rw-r--r-- | media/base/pipeline.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc index c2f1f13..31ccf58 100644 --- a/media/base/pipeline.cc +++ b/media/base/pipeline.cc @@ -724,11 +724,6 @@ void Pipeline::StopTask(const base::Closure& stop_cb) { return; } - // TODO(scherkus): Remove after pipeline state machine refactoring has some - // time to bake http://crbug.com/110228 - if (video_renderer_) - video_renderer_->PrepareForShutdownHack(); - SetState(kStopping); pending_callbacks_.reset(); stop_cb_ = stop_cb; |