Revert "Pipeline will execute a callback whenever an run-time error has happened."

TBR=kylep

Review URL: http://codereview.chromium.org/160287

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21885 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 52 deletions

diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 14a9524..d8bad19 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -92,11 +92,6 @@ void WebMediaPlayerImpl::Proxy::PipelineSeekCallback() {
       &WebMediaPlayerImpl::Proxy::PipelineSeekTask));
 }
 
-void WebMediaPlayerImpl::Proxy::PipelineErrorCallback() {
-  render_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
-      &WebMediaPlayerImpl::Proxy::PipelineErrorTask));
-}
-
 void WebMediaPlayerImpl::Proxy::RepaintTask() {
   DCHECK(MessageLoop::current() == render_loop_);
   {
@@ -123,13 +118,6 @@ void WebMediaPlayerImpl::Proxy::PipelineSeekTask() {
   }
 }
 
-void WebMediaPlayerImpl::Proxy::PipelineErrorTask() {
-  DCHECK(MessageLoop::current() == render_loop_);
-  if (webmediaplayer_) {
-    webmediaplayer_->OnPipelineError();
-  }
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // WebMediaPlayerImpl implementation
 
@@ -152,8 +140,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client,
     NOTREACHED() << "Could not start PipelineThread";
   } else {
     pipeline_ = new media::PipelineImpl(pipeline_thread_.message_loop());
-    pipeline_->SetPipelineErrorCallback(NewCallback(proxy_.get(),
-        &WebMediaPlayerImpl::Proxy::PipelineErrorCallback));
   }
 
   // Also we want to be notified of |main_loop_| destruction.
@@ -403,38 +389,6 @@ void WebMediaPlayerImpl::OnPipelineSeek() {
   }
 }
 
-void WebMediaPlayerImpl::OnPipelineError() {
-  DCHECK(MessageLoop::current() == main_loop_);
-  switch (pipeline_->GetError()) {
-    case media::PIPELINE_OK:
-    case media::PIPELINE_STOPPING:
-      // We're in a good state. Do nothing.
-      break;
-
-    case media::PIPELINE_ERROR_INITIALIZATION_FAILED:
-    case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING:
-    case media::PIPELINE_ERROR_COULD_NOT_RENDER:
-      // Format error.
-      SetNetworkState(WebMediaPlayer::FormatError);
-      break;
-
-    case media::PIPELINE_ERROR_URL_NOT_FOUND:
-    case media::PIPELINE_ERROR_NETWORK:
-    case media::PIPELINE_ERROR_DECODE:
-    case media::PIPELINE_ERROR_ABORT:
-    case media::PIPELINE_ERROR_OUT_OF_MEMORY:
-    case media::PIPELINE_ERROR_READ:
-    case media::PIPELINE_ERROR_AUDIO_HARDWARE:
-    case media::DEMUXER_ERROR_COULD_NOT_OPEN:
-    case media::DEMUXER_ERROR_COULD_NOT_PARSE:
-    case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
-    case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
-      // Decode error.
-      SetNetworkState(WebMediaPlayer::DecodeError);
-      break;
-  }
-}
-
 void WebMediaPlayerImpl::SetNetworkState(
     WebKit::WebMediaPlayer::NetworkState state) {
   DCHECK(MessageLoop::current() == main_loop_);
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index 841e9bf..a73ea71 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -106,7 +106,6 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
     // WebMediaPlayerImpl.
     void PipelineInitializationCallback();
     void PipelineSeekCallback();
-    void PipelineErrorCallback();
 
    private:
     // Invoke |webmediaplayer_| to perform a repaint.
@@ -118,9 +117,6 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
     // Notify |webmediaplayer_| that a seek has finished.
     void PipelineSeekTask();
 
-    // Notify |webmediaplayer_| that a pipeline error has been set.
-    void PipelineErrorTask();
-
     // The render message loop where WebKit lives.
     MessageLoop* render_loop_;
     WebMediaPlayerImpl* webmediaplayer_;
@@ -217,8 +213,6 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
 
   void OnPipelineSeek();
 
-  void OnPipelineError();
-
  private:
   // Helpers that set the network/ready state and notifies the client if
   // they've changed.