diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 19:40:19 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 19:40:19 +0000 |
| commit | 68053a30044f678a37d80fc17001c653f3b6ce0c (patch) | |
| tree | aafb26b9d8f7f85c30a70abeb7f763c2e571553a /media | |
| parent | 2416c5697575c682f30c542ebef908892b09cdae (diff) | |
| download | chromium_src-68053a30044f678a37d80fc17001c653f3b6ce0c.zip chromium_src-68053a30044f678a37d80fc17001c653f3b6ce0c.tar.gz chromium_src-68053a30044f678a37d80fc17001c653f3b6ce0c.tar.bz2 | |
Fix a teardown hang caused by an Abort() call while there is a pending read.
BUG=64754
TEST=BufferedDataSourceTest.StopDoesNotUseMessageLoopForCallback , BufferedDataSourceTest.AbortDuringPendingRead
Review URL: http://codereview.chromium.org/6342018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/pipeline_impl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc index d039664..e096b22 100644 --- a/media/base/pipeline_impl.cc +++ b/media/base/pipeline_impl.cc @@ -377,7 +377,9 @@ PipelineImpl::State PipelineImpl::FindNextState(State current) { } else if (current == kFlushing) { // We will always honor Seek() before Stop(). This is based on the // assumption that we never accept Seek() after Stop(). - DCHECK(IsPipelineSeeking() || IsPipelineStopPending()); + DCHECK(IsPipelineSeeking() || + IsPipelineStopPending() || + IsPipelineTearingDown()); return IsPipelineSeeking() ? kSeeking : kStopping; } else if (current == kSeeking) { return kStarting; |