Index: webkit/media/webmediaplayer_proxy.cc |
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc |
index bac3d8b62bf3b1f94537a996f6e60e0177c8142c..acb59e858dbf8dbb820b91eaeb3a5ef3aef36424 100644 |
--- a/webkit/media/webmediaplayer_proxy.cc |
+++ b/webkit/media/webmediaplayer_proxy.cc |
@@ -89,12 +89,6 @@ void WebMediaPlayerProxy::Detach() { |
frame_provider_ = NULL; |
} |
-void WebMediaPlayerProxy::PipelineInitializationCallback( |
- PipelineStatus status) { |
- render_loop_->PostTask(FROM_HERE, base::Bind( |
- &WebMediaPlayerProxy::PipelineInitializationTask, this, status)); |
-} |
- |
void WebMediaPlayerProxy::PipelineSeekCallback(PipelineStatus status) { |
render_loop_->PostTask(FROM_HERE, base::Bind( |
&WebMediaPlayerProxy::PipelineSeekTask, this, status)); |
@@ -111,6 +105,12 @@ void WebMediaPlayerProxy::PipelineErrorCallback(PipelineStatus error) { |
&WebMediaPlayerProxy::PipelineErrorTask, this, error)); |
} |
+void WebMediaPlayerProxy::PipelineBufferingStateCallback( |
+ media::Pipeline::BufferingState buffering_state) { |
+ render_loop_->PostTask(FROM_HERE, base::Bind( |
+ &WebMediaPlayerProxy::PipelineBufferingStateTask, this, buffering_state)); |
+} |
+ |
void WebMediaPlayerProxy::RepaintTask() { |
DCHECK(render_loop_->BelongsToCurrentThread()); |
{ |
@@ -123,12 +123,6 @@ void WebMediaPlayerProxy::RepaintTask() { |
} |
} |
-void WebMediaPlayerProxy::PipelineInitializationTask(PipelineStatus status) { |
- DCHECK(render_loop_->BelongsToCurrentThread()); |
- if (webmediaplayer_) |
- webmediaplayer_->OnPipelineInitialize(status); |
-} |
- |
void WebMediaPlayerProxy::PipelineSeekTask(PipelineStatus status) { |
DCHECK(render_loop_->BelongsToCurrentThread()); |
if (webmediaplayer_) |
@@ -147,6 +141,13 @@ void WebMediaPlayerProxy::PipelineErrorTask(PipelineStatus error) { |
webmediaplayer_->OnPipelineError(error); |
} |
+void WebMediaPlayerProxy::PipelineBufferingStateTask( |
+ media::Pipeline::BufferingState buffering_state) { |
+ DCHECK(render_loop_->BelongsToCurrentThread()); |
+ if (webmediaplayer_) |
+ webmediaplayer_->OnPipelineBufferingState(buffering_state); |
+} |
+ |
void WebMediaPlayerProxy::SetOpaqueTask(bool opaque) { |
DCHECK(render_loop_->BelongsToCurrentThread()); |
if (webmediaplayer_) |