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

Unified Diff: media/mojo/clients/mojo_renderer_factory.cc

Issue 2387293007: Register MediaPlayerRenderer service (Closed)
Patch Set: Addressed comments Created 4 years, 2 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
« media/blink/webmediaplayer_impl.cc ('K') | « media/mojo/clients/mojo_renderer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/clients/mojo_renderer_factory.cc
diff --git a/media/mojo/clients/mojo_renderer_factory.cc b/media/mojo/clients/mojo_renderer_factory.cc
index 750b5140d69f0cc30b30ee8c678d93a6ccacdf38..69aaea296b9e6fd4936c68920b7f89eab30915de 100644
--- a/media/mojo/clients/mojo_renderer_factory.cc
+++ b/media/mojo/clients/mojo_renderer_factory.cc
@@ -17,7 +17,6 @@ MojoRendererFactory::MojoRendererFactory(
shell::mojom::InterfaceProvider* interface_provider)
: get_gpu_factories_cb_(get_gpu_factories_cb),
interface_provider_(interface_provider) {
- DCHECK(!get_gpu_factories_cb_.is_null());
DCHECK(interface_provider_);
}
@@ -29,8 +28,12 @@ std::unique_ptr<Renderer> MojoRendererFactory::CreateRenderer(
AudioRendererSink* /* audio_renderer_sink */,
VideoRendererSink* video_renderer_sink,
const RequestSurfaceCB& /* request_surface_cb */) {
- std::unique_ptr<VideoOverlayFactory> overlay_factory(
- new VideoOverlayFactory(get_gpu_factories_cb_.Run()));
+ std::unique_ptr<VideoOverlayFactory> overlay_factory;
+
+ if (!get_gpu_factories_cb_.is_null()) {
xhwang 2016/10/12 20:14:15 Please add a comment when this could be null.
tguilbert 2016/10/12 21:46:25 Done.
+ overlay_factory =
+ base::MakeUnique<VideoOverlayFactory>(get_gpu_factories_cb_.Run());
+ }
mojom::RendererPtr renderer_ptr;
shell::GetInterface<mojom::Renderer>(interface_provider_, &renderer_ptr);
« media/blink/webmediaplayer_impl.cc ('K') | « media/mojo/clients/mojo_renderer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698