summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-23 17:17:40 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-23 17:17:40 +0000
commit6e66ad5734c7975a6cb8e5c076e5ec567768d718 (patch)
tree59dca7d7d069b7339518ab4b196d016a99a803a1 /webkit/glue
parent6a1b224cac50ee395704c1062a0d040b0c235199 (diff)
downloadchromium_src-6e66ad5734c7975a6cb8e5c076e5ec567768d718.zip
chromium_src-6e66ad5734c7975a6cb8e5c076e5ec567768d718.tar.gz
chromium_src-6e66ad5734c7975a6cb8e5c076e5ec567768d718.tar.bz2
Revert 70063 - 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/6016011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webmediaplayer_impl.cc2
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;