Merge 21877 - Pipeline will execute a callback whenever an runtime error has ...

webkit/glue/webmediaplayer_impl.h

Index: webkit/glue/webmediaplayer_impl.h
===================================================================
--- webkit/glue/webmediaplayer_impl.h	(revision 22792)
+++ webkit/glue/webmediaplayer_impl.h	(working copy)
@@ -106,6 +106,7 @@
     // WebMediaPlayerImpl.
     void PipelineInitializationCallback();
     void PipelineSeekCallback();
+    void PipelineErrorCallback();
 
    private:
     // Invoke |webmediaplayer_| to perform a repaint.
@@ -117,6 +118,9 @@
     // 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_;
@@ -213,6 +217,8 @@
 
   void OnPipelineSeek();
 
+  void OnPipelineError();
+
  private:
   // Helpers that set the network/ready state and notifies the client if
   // they've changed.
Property changes on: webkit\glue\webmediaplayer_impl.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/webmediaplayer_impl.h:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/glue/webmediaplayer_impl.h:r21877