Index: webkit/glue/webmediaplayer_impl.h |
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h |
index e7acf27cb47a6ee8bf1adb69d235fec19133053c..9ab4c9b47dbaaa62b3c570a9a0fe7366a760504b 100644 |
--- a/webkit/glue/webmediaplayer_impl.h |
+++ b/webkit/glue/webmediaplayer_impl.h |
@@ -111,11 +111,11 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, |
void AbortDataSources(); |
// Methods for PipelineImpl -> WebMediaPlayerImpl communication. |
- void PipelineInitializationCallback(); |
- void PipelineSeekCallback(); |
- void PipelineEndedCallback(); |
- void PipelineErrorCallback(); |
- void NetworkEventCallback(); |
+ void PipelineInitializationCallback(media::PipelineStatus status); |
+ void PipelineSeekCallback(media::PipelineStatus status); |
+ void PipelineEndedCallback(media::PipelineStatus status); |
+ void PipelineStatusCallback(media::PipelineStatus status); |
acolwell GONE FROM CHROMIUM
2011/03/15 03:56:28
I think this should stay PipelineErrorCallback() s
Ami GONE FROM CHROMIUM
2011/03/15 17:37:18
Done.
|
+ void NetworkEventCallback(media::PipelineStatus status); |
// Returns the message loop used by the proxy. |
MessageLoop* message_loop() { return render_loop_; } |
@@ -132,19 +132,19 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, |
void RepaintTask(); |
// Notify |webmediaplayer_| that initialization has finished. |
- void PipelineInitializationTask(); |
+ void PipelineInitializationTask(media::PipelineStatus status); |
// Notify |webmediaplayer_| that a seek has finished. |
- void PipelineSeekTask(); |
+ void PipelineSeekTask(media::PipelineStatus status); |
// Notify |webmediaplayer_| that the media has ended. |
- void PipelineEndedTask(); |
+ void PipelineEndedTask(media::PipelineStatus status); |
// Notify |webmediaplayer_| that a pipeline error has been set. |
acolwell GONE FROM CHROMIUM
2011/03/15 03:56:28
Maybe change to something like, "Notify |webmediap
Ami GONE FROM CHROMIUM
2011/03/15 17:37:18
Done.
|
- void PipelineErrorTask(); |
+ void PipelineStatusTask(media::PipelineStatus status); |
acolwell GONE FROM CHROMIUM
2011/03/15 03:56:28
PipelineErrorTask() since it is only called on an
Ami GONE FROM CHROMIUM
2011/03/15 17:37:18
Done.
|
// Notify |webmediaplayer_| that there's a network event. |
- void NetworkEventTask(); |
+ void NetworkEventTask(media::PipelineStatus status); |
// The render message loop where WebKit lives. |
MessageLoop* render_loop_; |
@@ -261,15 +261,15 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, |
void Repaint(); |
- void OnPipelineInitialize(); |
+ void OnPipelineInitialize(media::PipelineStatus status); |
- void OnPipelineSeek(); |
+ void OnPipelineSeek(media::PipelineStatus status); |
- void OnPipelineEnded(); |
+ void OnPipelineEnded(media::PipelineStatus status); |
- void OnPipelineError(); |
+ void OnPipelineStatus(media::PipelineStatus status); |
acolwell GONE FROM CHROMIUM
2011/03/15 03:56:28
Same comment as above.
Ami GONE FROM CHROMIUM
2011/03/15 17:37:18
Done, but note that the impl used to treat PIPELIN
|
- void OnNetworkEvent(); |
+ void OnNetworkEvent(media::PipelineStatus status); |
private: |
// Helpers that set the network/ready state and notifies the client if |
@@ -282,7 +282,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, |
// Callback executed after |pipeline_| stops which signals Destroy() |
// to continue. |
- void PipelineStoppedCallback(); |
+ void PipelineStoppedCallback(media::PipelineStatus status); |
// Getter method to |client_|. |
WebKit::WebMediaPlayerClient* GetClient(); |