diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 23:53:42 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 23:53:42 +0000 |
| commit | 2f7e359cd8efd9f457c421c73d470a574ca2da57 (patch) | |
| tree | ea5fe846120f0d404e3717c47f807ffdfab37f1c /webkit | |
| parent | a684f124276f04ff2ad362c1f2d464dd013b2473 (diff) | |
| download | chromium_src-2f7e359cd8efd9f457c421c73d470a574ca2da57.zip chromium_src-2f7e359cd8efd9f457c421c73d470a574ca2da57.tar.gz chromium_src-2f7e359cd8efd9f457c421c73d470a574ca2da57.tar.bz2 | |
Revert 70277 - Revert 70275 - Revert 70267 - Refactor PipelineImpl to use CompositeFilter to manage Filter state transitions.
BUG=54110
TEST=media_unittests CompositeFilterTest.*
Review URL: http://codereview.chromium.org/5744002
TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/6026013
TBR=acolwell@chromium.org
TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/5974011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 005c7cf..4a64b0f 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -737,8 +737,6 @@ void WebMediaPlayerImpl::OnPipelineError() { case media::PIPELINE_ERROR_ABORT: case media::PIPELINE_ERROR_OUT_OF_MEMORY: case media::PIPELINE_ERROR_AUDIO_HARDWARE: - case media::PIPELINE_ERROR_OPERATION_PENDING: - case media::PIPELINE_ERROR_INVALID_STATE: // Decode error. SetNetworkState(WebMediaPlayer::DecodeError); break; |