Commit 114a7bfc authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Convert ApplicationMediaCapabilities to new Mojo types

This CL converts ApplicationMediaCapabilitiesRequest
and ApplicationMediaCapabilitiesPtr to  new Mojo types.
It uses ReceiverSet and PendingRemote or Remote instead
of BindingSet and ApplicationMediaCapabilitiesPtr.

Bug: 955171
Change-Id: I4b03e7bc1c4412e370d2fbd95d812a0ee53a08dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1786705
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: default avatarLuke Halliwell <halliwell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695556}
parent 6b1797a3
...@@ -16,9 +16,9 @@ ApplicationMediaCapabilities::ApplicationMediaCapabilities() ...@@ -16,9 +16,9 @@ ApplicationMediaCapabilities::ApplicationMediaCapabilities()
ApplicationMediaCapabilities::~ApplicationMediaCapabilities() = default; ApplicationMediaCapabilities::~ApplicationMediaCapabilities() = default;
void ApplicationMediaCapabilities::AddBinding( void ApplicationMediaCapabilities::AddReceiver(
mojom::ApplicationMediaCapabilitiesRequest request) { mojo::PendingReceiver<mojom::ApplicationMediaCapabilities> receiver) {
bindings_.AddBinding(this, std::move(request)); receivers_.Add(this, std::move(receiver));
} }
void ApplicationMediaCapabilities::SetSupportedBitstreamAudioCodecs( void ApplicationMediaCapabilities::SetSupportedBitstreamAudioCodecs(
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include "base/macros.h" #include "base/macros.h"
#include "chromecast/common/mojom/application_media_capabilities.mojom.h" #include "chromecast/common/mojom/application_media_capabilities.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
#include "mojo/public/cpp/bindings/remote_set.h" #include "mojo/public/cpp/bindings/remote_set.h"
namespace content { namespace content {
...@@ -24,7 +24,8 @@ class ApplicationMediaCapabilities ...@@ -24,7 +24,8 @@ class ApplicationMediaCapabilities
ApplicationMediaCapabilities(); ApplicationMediaCapabilities();
~ApplicationMediaCapabilities() override; ~ApplicationMediaCapabilities() override;
void AddBinding(mojom::ApplicationMediaCapabilitiesRequest request); void AddReceiver(
mojo::PendingReceiver<mojom::ApplicationMediaCapabilities> receiver);
void SetSupportedBitstreamAudioCodecs(int codecs); void SetSupportedBitstreamAudioCodecs(int codecs);
...@@ -34,7 +35,7 @@ class ApplicationMediaCapabilities ...@@ -34,7 +35,7 @@ class ApplicationMediaCapabilities
mojo::PendingRemote<mojom::ApplicationMediaCapabilitiesObserver> mojo::PendingRemote<mojom::ApplicationMediaCapabilitiesObserver>
observer_remote) override; observer_remote) override;
mojo::BindingSet<mojom::ApplicationMediaCapabilities> bindings_; mojo::ReceiverSet<mojom::ApplicationMediaCapabilities> receivers_;
mojo::RemoteSet<mojom::ApplicationMediaCapabilitiesObserver> observers_; mojo::RemoteSet<mojom::ApplicationMediaCapabilitiesObserver> observers_;
int supported_bitstream_audio_codecs_; int supported_bitstream_audio_codecs_;
......
...@@ -176,9 +176,9 @@ void CastContentRendererClient::RenderFrameCreated( ...@@ -176,9 +176,9 @@ void CastContentRendererClient::RenderFrameCreated(
new OnLoadScriptInjector(render_frame); new OnLoadScriptInjector(render_frame);
if (!app_media_capabilities_observer_receiver_.is_bound()) { if (!app_media_capabilities_observer_receiver_.is_bound()) {
mojom::ApplicationMediaCapabilitiesPtr app_media_capabilities; mojo::Remote<mojom::ApplicationMediaCapabilities> app_media_capabilities;
render_frame->GetRemoteInterfaces()->GetInterface( render_frame->GetRemoteInterfaces()->GetInterface(
mojo::MakeRequest(&app_media_capabilities)); app_media_capabilities.BindNewPipeAndPassReceiver());
app_media_capabilities->AddObserver( app_media_capabilities->AddObserver(
app_media_capabilities_observer_receiver_.BindNewPipeAndPassRemote()); app_media_capabilities_observer_receiver_.BindNewPipeAndPassRemote());
} }
......
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