Commit c6e71069 authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Migrate InterfaceFactory::CreateCastRenderer to new Mojo type

As a following CL, this CL applies pending_receiver to
the second parameter of CreateCastRenderer.

  - Convert FooRequest to mojo::PendingReceiver.

Bug: 955171
Change-Id: I4e06c59e550c5ca0c17aadae40871de017c69f0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1881000Reviewed-by: default avatarChrome Cunningham <chcunningham@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Reviewed-by: default avatarSam McNally <sammc@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#709786}
parent 91aab85b
...@@ -177,13 +177,13 @@ void MediaInterfaceProxy::CreateDefaultRenderer( ...@@ -177,13 +177,13 @@ void MediaInterfaceProxy::CreateDefaultRenderer(
#if BUILDFLAG(ENABLE_CAST_RENDERER) #if BUILDFLAG(ENABLE_CAST_RENDERER)
void MediaInterfaceProxy::CreateCastRenderer( void MediaInterfaceProxy::CreateCastRenderer(
const base::UnguessableToken& overlay_plane_id, const base::UnguessableToken& overlay_plane_id,
media::mojom::RendererRequest request) { mojo::PendingReceiver<media::mojom::Renderer> receiver) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
// CastRenderer is always hosted in "media_renderer" service. // CastRenderer is always hosted in "media_renderer" service.
InterfaceFactory* factory = media_renderer_interface_factory_ptr_->Get(); InterfaceFactory* factory = media_renderer_interface_factory_ptr_->Get();
if (factory) if (factory)
factory->CreateCastRenderer(overlay_plane_id, std::move(request)); factory->CreateCastRenderer(overlay_plane_id, std::move(receiver));
} }
#endif #endif
......
...@@ -58,8 +58,9 @@ class MediaInterfaceProxy : public media::mojom::InterfaceFactory { ...@@ -58,8 +58,9 @@ class MediaInterfaceProxy : public media::mojom::InterfaceFactory {
void CreateDefaultRenderer(const std::string& audio_device_id, void CreateDefaultRenderer(const std::string& audio_device_id,
media::mojom::RendererRequest request) final; media::mojom::RendererRequest request) final;
#if BUILDFLAG(ENABLE_CAST_RENDERER) #if BUILDFLAG(ENABLE_CAST_RENDERER)
void CreateCastRenderer(const base::UnguessableToken& overlay_plane_id, void CreateCastRenderer(
media::mojom::RendererRequest request) final; const base::UnguessableToken& overlay_plane_id,
mojo::PendingReceiver<media::mojom::Renderer> receiver) final;
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
void CreateFlingingRenderer( void CreateFlingingRenderer(
......
...@@ -49,7 +49,7 @@ void VideoDecoderProxy::CreateDefaultRenderer( ...@@ -49,7 +49,7 @@ void VideoDecoderProxy::CreateDefaultRenderer(
#if BUILDFLAG(ENABLE_CAST_RENDERER) #if BUILDFLAG(ENABLE_CAST_RENDERER)
void VideoDecoderProxy::CreateCastRenderer( void VideoDecoderProxy::CreateCastRenderer(
const base::UnguessableToken& overlay_plane_id, const base::UnguessableToken& overlay_plane_id,
media::mojom::RendererRequest request) {} mojo::PendingReceiver<media::mojom::Renderer> receiver) {}
#endif // BUILDFLAG(ENABLE_CAST_RENDERER) #endif // BUILDFLAG(ENABLE_CAST_RENDERER)
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
......
...@@ -40,8 +40,9 @@ class CONTENT_EXPORT VideoDecoderProxy : public media::mojom::InterfaceFactory { ...@@ -40,8 +40,9 @@ class CONTENT_EXPORT VideoDecoderProxy : public media::mojom::InterfaceFactory {
void CreateDefaultRenderer(const std::string& audio_device_id, void CreateDefaultRenderer(const std::string& audio_device_id,
media::mojom::RendererRequest request) final; media::mojom::RendererRequest request) final;
#if BUILDFLAG(ENABLE_CAST_RENDERER) #if BUILDFLAG(ENABLE_CAST_RENDERER)
void CreateCastRenderer(const base::UnguessableToken& overlay_plane_id, void CreateCastRenderer(
media::mojom::RendererRequest request) final; const base::UnguessableToken& overlay_plane_id,
mojo::PendingReceiver<media::mojom::Renderer> receiver) final;
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
void CreateMediaPlayerRenderer( void CreateMediaPlayerRenderer(
......
...@@ -71,18 +71,18 @@ void MediaInterfaceFactory::CreateDefaultRenderer( ...@@ -71,18 +71,18 @@ void MediaInterfaceFactory::CreateDefaultRenderer(
#if BUILDFLAG(ENABLE_CAST_RENDERER) #if BUILDFLAG(ENABLE_CAST_RENDERER)
void MediaInterfaceFactory::CreateCastRenderer( void MediaInterfaceFactory::CreateCastRenderer(
const base::UnguessableToken& overlay_plane_id, const base::UnguessableToken& overlay_plane_id,
media::mojom::RendererRequest request) { mojo::PendingReceiver<media::mojom::Renderer> receiver) {
if (!task_runner_->BelongsToCurrentThread()) { if (!task_runner_->BelongsToCurrentThread()) {
task_runner_->PostTask( task_runner_->PostTask(
FROM_HERE, FROM_HERE,
base::BindOnce(&MediaInterfaceFactory::CreateCastRenderer, weak_this_, base::BindOnce(&MediaInterfaceFactory::CreateCastRenderer, weak_this_,
overlay_plane_id, std::move(request))); overlay_plane_id, std::move(receiver)));
return; return;
} }
DVLOG(1) << __func__; DVLOG(1) << __func__;
GetMediaInterfaceFactory()->CreateCastRenderer(overlay_plane_id, GetMediaInterfaceFactory()->CreateCastRenderer(overlay_plane_id,
std::move(request)); std::move(receiver));
} }
#endif #endif
......
...@@ -41,8 +41,9 @@ class CONTENT_EXPORT MediaInterfaceFactory ...@@ -41,8 +41,9 @@ class CONTENT_EXPORT MediaInterfaceFactory
void CreateDefaultRenderer(const std::string& audio_device_id, void CreateDefaultRenderer(const std::string& audio_device_id,
media::mojom::RendererRequest request) final; media::mojom::RendererRequest request) final;
#if BUILDFLAG(ENABLE_CAST_RENDERER) #if BUILDFLAG(ENABLE_CAST_RENDERER)
void CreateCastRenderer(const base::UnguessableToken& overlay_plane_id, void CreateCastRenderer(
media::mojom::RendererRequest request) final; const base::UnguessableToken& overlay_plane_id,
mojo::PendingReceiver<media::mojom::Renderer> receiver) final;
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
void CreateFlingingRenderer( void CreateFlingingRenderer(
......
...@@ -35,7 +35,7 @@ interface InterfaceFactory { ...@@ -35,7 +35,7 @@ interface InterfaceFactory {
// When CastRendererFactory is implemented, Chromecast will switch // When CastRendererFactory is implemented, Chromecast will switch
// from using CreateDefaultRenderer() to using this one. // from using CreateDefaultRenderer() to using this one.
CreateCastRenderer(mojo_base.mojom.UnguessableToken overlay_plane_id, CreateCastRenderer(mojo_base.mojom.UnguessableToken overlay_plane_id,
Renderer& renderer); pending_receiver<Renderer> renderer);
[EnableIf=is_android] [EnableIf=is_android]
// Creates a MediaPlayerRenderer (MediaPlayerRendererFactory). // Creates a MediaPlayerRenderer (MediaPlayerRendererFactory).
......
...@@ -127,7 +127,7 @@ void InterfaceFactoryImpl::CreateDefaultRenderer( ...@@ -127,7 +127,7 @@ void InterfaceFactoryImpl::CreateDefaultRenderer(
#if BUILDFLAG(ENABLE_CAST_RENDERER) #if BUILDFLAG(ENABLE_CAST_RENDERER)
void InterfaceFactoryImpl::CreateCastRenderer( void InterfaceFactoryImpl::CreateCastRenderer(
const base::UnguessableToken& overlay_plane_id, const base::UnguessableToken& overlay_plane_id,
media::mojom::RendererRequest request) { mojo::PendingReceiver<media::mojom::Renderer> receiver) {
DVLOG(2) << __func__; DVLOG(2) << __func__;
auto renderer = mojo_media_client_->CreateCastRenderer( auto renderer = mojo_media_client_->CreateCastRenderer(
host_interfaces_.get(), base::ThreadTaskRunnerHandle::Get(), &media_log_, host_interfaces_.get(), base::ThreadTaskRunnerHandle::Get(), &media_log_,
...@@ -144,7 +144,7 @@ void InterfaceFactoryImpl::CreateCastRenderer( ...@@ -144,7 +144,7 @@ void InterfaceFactoryImpl::CreateCastRenderer(
MojoRendererService* mojo_renderer_service_ptr = mojo_renderer_service.get(); MojoRendererService* mojo_renderer_service_ptr = mojo_renderer_service.get();
mojo::BindingId binding_id = renderer_bindings_.AddBinding( mojo::BindingId binding_id = renderer_bindings_.AddBinding(
std::move(mojo_renderer_service), std::move(request)); std::move(mojo_renderer_service), std::move(receiver));
// base::Unretained() is safe because the callback will be fired by // base::Unretained() is safe because the callback will be fired by
// |mojo_renderer_service|, which is owned by |renderer_bindings_|. // |mojo_renderer_service|, which is owned by |renderer_bindings_|.
......
...@@ -50,8 +50,9 @@ class InterfaceFactoryImpl : public DeferredDestroy<mojom::InterfaceFactory> { ...@@ -50,8 +50,9 @@ class InterfaceFactoryImpl : public DeferredDestroy<mojom::InterfaceFactory> {
void CreateDefaultRenderer(const std::string& audio_device_id, void CreateDefaultRenderer(const std::string& audio_device_id,
mojom::RendererRequest request) final; mojom::RendererRequest request) final;
#if BUILDFLAG(ENABLE_CAST_RENDERER) #if BUILDFLAG(ENABLE_CAST_RENDERER)
void CreateCastRenderer(const base::UnguessableToken& overlay_plane_id, void CreateCastRenderer(
media::mojom::RendererRequest request) final; const base::UnguessableToken& overlay_plane_id,
mojo::PendingReceiver<media::mojom::Renderer> receiver) final;
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
void CreateMediaPlayerRenderer( void CreateMediaPlayerRenderer(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment