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

Unified Diff: media/mojo/services/mojo_renderer_impl.cc

Issue 870693002: Require Renderer::Initialize() to return a status code via callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments. Created 5 years, 11 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
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.h ('k') | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_impl.cc
diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc
index 08a8ca5f762b8a15328ce0e4dbd1f8b114eb85e2..bf422a30deb7881fc22e2b1f9e4a6135d51fe586 100644
--- a/media/mojo/services/mojo_renderer_impl.cc
+++ b/media/mojo/services/mojo_renderer_impl.cc
@@ -35,7 +35,7 @@ MojoRendererImpl::~MojoRendererImpl() {
// TODO(xhwang): Support |paint_cb| if needed.
void MojoRendererImpl::Initialize(
DemuxerStreamProvider* demuxer_stream_provider,
- const base::Closure& init_cb,
+ const PipelineStatusCB& init_cb,
const StatisticsCB& statistics_cb,
const BufferingStateCB& buffering_state_cb,
const PaintCB& /* paint_cb */,
@@ -202,15 +202,14 @@ void MojoRendererImpl::OnError() {
if (init_cb_.is_null()) // We have initialized already.
error_cb_.Run(PIPELINE_ERROR_DECODE);
else
- error_cb_.Run(PIPELINE_ERROR_COULD_NOT_RENDER);
+ init_cb_.Run(PIPELINE_ERROR_COULD_NOT_RENDER);
}
void MojoRendererImpl::OnInitialized() {
DVLOG(1) << __FUNCTION__;
DCHECK(task_runner_->BelongsToCurrentThread());
- DCHECK(!init_cb_.is_null());
-
- base::ResetAndReturn(&init_cb_).Run();
+ if (!init_cb_.is_null())
+ base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
}
} // namespace media
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.h ('k') | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698