| Index: media/mojo/services/mojo_renderer_service.cc
|
| diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
|
| index ce94a77a5a3150d66c628c0ef74caebdca8779b2..7cc3693b3e40c94929f5c2fbd13ce989e2649ec9 100644
|
| --- a/media/mojo/services/mojo_renderer_service.cc
|
| +++ b/media/mojo/services/mojo_renderer_service.cc
|
| @@ -11,6 +11,7 @@
|
| #include "media/base/renderer.h"
|
| #include "media/mojo/services/demuxer_stream_provider_shim.h"
|
| #include "media/mojo/services/mojo_cdm_service_context.h"
|
| +#include "mojo/converters/geometry/geometry_type_converters.h"
|
|
|
| namespace media {
|
|
|
| @@ -109,10 +110,11 @@ void MojoRendererService::OnStreamReady(
|
|
|
| renderer_->Initialize(
|
| stream_provider_.get(),
|
| - base::Bind(
|
| - &MojoRendererService::OnRendererInitializeDone, weak_this_, callback),
|
| + base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
|
| + callback),
|
| base::Bind(&MojoRendererService::OnUpdateStatistics, weak_this_),
|
| base::Bind(&MojoRendererService::OnBufferingStateChanged, weak_this_),
|
| + base::Bind(&MojoRendererService::OnNaturalSizeChanged, weak_this_),
|
| base::Bind(&MojoRendererService::OnRendererEnded, weak_this_),
|
| base::Bind(&MojoRendererService::OnError, weak_this_),
|
| base::Bind(base::DoNothing));
|
| @@ -168,6 +170,11 @@ void MojoRendererService::OnBufferingStateChanged(
|
| static_cast<interfaces::BufferingState>(new_buffering_state));
|
| }
|
|
|
| +void MojoRendererService::OnNaturalSizeChanged(const gfx::Size& size) {
|
| + DVLOG(2) << __FUNCTION__ << "(" << size.ToString() << ")";
|
| + client_->OnNaturalSizeChanged(mojo::Size::From(size));
|
| +}
|
| +
|
| void MojoRendererService::OnRendererEnded() {
|
| DVLOG(1) << __FUNCTION__;
|
| CancelPeriodicMediaTimeUpdates();
|
|
|