diff options
| author | boliu@google.com <boliu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 21:52:48 +0000 |
|---|---|---|
| committer | boliu@google.com <boliu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 21:52:48 +0000 |
| commit | 71cb533c8712331906346ddea2fce0c3fccec78c (patch) | |
| tree | 08c6e472c937ca35022c4b5a0bc5981b0d1b2203 /webkit | |
| parent | 9a26e33ca80eb7352da8f0ce020c3c8402fdc6d7 (diff) | |
| download | chromium_src-71cb533c8712331906346ddea2fce0c3fccec78c.zip chromium_src-71cb533c8712331906346ddea2fce0c3fccec78c.tar.gz chromium_src-71cb533c8712331906346ddea2fce0c3fccec78c.tar.bz2 | |
Change MediaFilter::Stop() to accept a callback so that Stop() is asynchronous. So far PipelineImpl handles asynchronous MediaFilter::Stop(). The actual change to make MediaFilter::Stop() asynchronous will be in another check in.
BUG=16059
TEST=Unit tests still runs
Review URL: http://codereview.chromium.org/2101015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 0157c80..66cf896 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -634,10 +634,6 @@ void WebMediaPlayerImpl::OnPipelineError() { DCHECK(MessageLoop::current() == main_loop_); switch (pipeline_->GetError()) { case media::PIPELINE_OK: - case media::PIPELINE_STOPPING: - NOTREACHED() << "We shouldn't get called with these non-errors"; - break; - case media::PIPELINE_ERROR_INITIALIZATION_FAILED: case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING: case media::PIPELINE_ERROR_COULD_NOT_RENDER: |