Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(631)

Unified Diff: webkit/media/webmediaplayer_proxy.cc

Issue 10854151: Allow transitioning to HAVE_METADATA before pipeline initialization completes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments and fix tests. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webkit/media/webmediaplayer_proxy.h ('K') | « webkit/media/webmediaplayer_proxy.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_proxy.cc
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc
index bac3d8b62bf3b1f94537a996f6e60e0177c8142c..27140d179ea0b15092cf5ccbefd0f3bfc503de67 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::PipelineReadyStateCallback(
+ media::Pipeline::ReadyState readyState) {
scherkus (not reviewing) 2012/08/15 23:43:16 unix_hacker
acolwell GONE FROM CHROMIUM 2012/08/16 00:54:18 Done.
+ render_loop_->PostTask(FROM_HERE, base::Bind(
+ &WebMediaPlayerProxy::PipelineReadyStateTask, this, readyState));
+}
+
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::PipelineReadyStateTask(
+ media::Pipeline::ReadyState readyState) {
scherkus (not reviewing) 2012/08/15 23:43:16 unix_hacker
acolwell GONE FROM CHROMIUM 2012/08/16 00:54:18 Done.
+ DCHECK(render_loop_->BelongsToCurrentThread());
+ if (webmediaplayer_)
+ webmediaplayer_->OnPipelineReadyState(readyState);
+}
+
void WebMediaPlayerProxy::SetOpaqueTask(bool opaque) {
DCHECK(render_loop_->BelongsToCurrentThread());
if (webmediaplayer_)
« webkit/media/webmediaplayer_proxy.h ('K') | « webkit/media/webmediaplayer_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698