diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 10:45:18 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 10:45:18 +0000 |
| commit | 563f52fa046c262fc6775dc08ea420f880949745 (patch) | |
| tree | 4c2f287f631b683b98a675afdf67012b6c9617bd /media | |
| parent | 4d5bf30de8e86437379152646d315226e5e5f2c6 (diff) | |
| download | chromium_src-563f52fa046c262fc6775dc08ea420f880949745.zip chromium_src-563f52fa046c262fc6775dc08ea420f880949745.tar.gz chromium_src-563f52fa046c262fc6775dc08ea420f880949745.tar.bz2 | |
Collapse two case statements into one, they do the same thing.
BUG=None
TEST=None
CID=14359
Review URL: http://codereview.chromium.org/6676146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/composite_filter.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/base/composite_filter.cc b/media/base/composite_filter.cc index d08eacb..537d262 100644 --- a/media/base/composite_filter.cc +++ b/media/base/composite_filter.cc @@ -152,7 +152,7 @@ void CompositeFilter::Stop(FilterCallback* stop_callback) { return; } - switch(state_) { + switch (state_) { case kError: case kCreated: case kPaused: @@ -258,7 +258,7 @@ void CompositeFilter::StartParallelCallSequence() { void CompositeFilter::CallFilter(scoped_refptr<Filter>& filter, FilterCallback* callback) { - switch(state_) { + switch (state_) { case kPlayPending: filter->Play(callback); break; @@ -295,7 +295,6 @@ CompositeFilter::State CompositeFilter::GetNextState(State state) const { ret = kPlaying; break; case kPausePending: - ret = kPaused; case kFlushPending: ret = kPaused; break; |