diff options
author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 18:11:43 +0000 |
---|---|---|
committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 18:11:43 +0000 |
commit | 779000e07ebcdb833a96c5fa398250b7a1d429a0 (patch) | |
tree | f875d3cb37e136506a737bb050e11470eefbc7a9 /webkit/glue/webmediaplayer_impl.cc | |
parent | dd445fb1fabc555b0232488e3ef58a09beaaa195 (diff) | |
download | chromium_src-779000e07ebcdb833a96c5fa398250b7a1d429a0.zip chromium_src-779000e07ebcdb833a96c5fa398250b7a1d429a0.tar.gz chromium_src-779000e07ebcdb833a96c5fa398250b7a1d429a0.tar.bz2 |
Revert 69959 - 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/5987008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
-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; |