Commit 56d9693b authored by Mario Sanchez Prada's avatar Mario Sanchez Prada Committed by Commit Bot

Migrate references to media::mojom::FlingingRendererClientExtension

Convert the remaining bits referencing this mojo interface using the
old mojo APIs, to the new mojo types.

Bug: 955171
Change-Id: I552ea14b3bcd3700423bc13dc0bf0a9cc1198d0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1881233Reviewed-by: default avatarYuri Wiitala <miu@chromium.org>
Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#710256}
parent 7549a004
...@@ -12,16 +12,15 @@ ...@@ -12,16 +12,15 @@
namespace content { namespace content {
FlingingRendererClient::FlingingRendererClient( FlingingRendererClient::FlingingRendererClient(
ClientExtentionRequest client_extension_request, ClientExtentionPendingReceiver client_extension_receiver,
scoped_refptr<base::SingleThreadTaskRunner> media_task_runner, scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
std::unique_ptr<media::MojoRenderer> mojo_renderer, std::unique_ptr<media::MojoRenderer> mojo_renderer,
media::RemotePlayStateChangeCB remote_play_state_change_cb) media::RemotePlayStateChangeCB remote_play_state_change_cb)
: MojoRendererWrapper(std::move(mojo_renderer)), : MojoRendererWrapper(std::move(mojo_renderer)),
media_task_runner_(std::move(media_task_runner)), media_task_runner_(std::move(media_task_runner)),
remote_play_state_change_cb_(remote_play_state_change_cb), remote_play_state_change_cb_(remote_play_state_change_cb),
delayed_bind_client_extension_request_( delayed_bind_client_extension_receiver_(
std::move(client_extension_request)), std::move(client_extension_receiver)) {}
client_extension_binding_(this) {}
FlingingRendererClient::~FlingingRendererClient() = default; FlingingRendererClient::~FlingingRendererClient() = default;
...@@ -32,8 +31,8 @@ void FlingingRendererClient::Initialize(media::MediaResource* media_resource, ...@@ -32,8 +31,8 @@ void FlingingRendererClient::Initialize(media::MediaResource* media_resource,
client_ = client; client_ = client;
client_extension_binding_.Bind( client_extension_receiver_.Bind(
std::move(delayed_bind_client_extension_request_), media_task_runner_); std::move(delayed_bind_client_extension_receiver_), media_task_runner_);
MojoRendererWrapper::Initialize(media_resource, client, std::move(init_cb)); MojoRendererWrapper::Initialize(media_resource, client, std::move(init_cb));
} }
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
#include "media/mojo/clients/mojo_renderer.h" #include "media/mojo/clients/mojo_renderer.h"
#include "media/mojo/clients/mojo_renderer_wrapper.h" #include "media/mojo/clients/mojo_renderer_wrapper.h"
#include "media/mojo/mojom/renderer_extensions.mojom.h" #include "media/mojo/mojom/renderer_extensions.mojom.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h"
namespace content { namespace content {
...@@ -29,11 +30,11 @@ class CONTENT_EXPORT FlingingRendererClient ...@@ -29,11 +30,11 @@ class CONTENT_EXPORT FlingingRendererClient
: public media::mojom::FlingingRendererClientExtension, : public media::mojom::FlingingRendererClientExtension,
public media::MojoRendererWrapper { public media::MojoRendererWrapper {
public: public:
using ClientExtentionRequest = using ClientExtentionPendingReceiver =
media::mojom::FlingingRendererClientExtensionRequest; mojo::PendingReceiver<media::mojom::FlingingRendererClientExtension>;
FlingingRendererClient( FlingingRendererClient(
ClientExtentionRequest client_extension_request, ClientExtentionPendingReceiver client_extension_receiver,
scoped_refptr<base::SingleThreadTaskRunner> media_task_runner, scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
std::unique_ptr<media::MojoRenderer> mojo_renderer, std::unique_ptr<media::MojoRenderer> mojo_renderer,
media::RemotePlayStateChangeCB remote_play_state_change_cb); media::RemotePlayStateChangeCB remote_play_state_change_cb);
...@@ -55,11 +56,12 @@ class CONTENT_EXPORT FlingingRendererClient ...@@ -55,11 +56,12 @@ class CONTENT_EXPORT FlingingRendererClient
media::RemotePlayStateChangeCB remote_play_state_change_cb_; media::RemotePlayStateChangeCB remote_play_state_change_cb_;
// Used temporarily, to delay binding to |client_extension_binding_| until we // Used temporarily, to delay binding to |client_extension_receiver_| until we
// are on the right sequence, when Initialize() is called. // are on the right sequence, when Initialize() is called.
ClientExtentionRequest delayed_bind_client_extension_request_; ClientExtentionPendingReceiver delayed_bind_client_extension_receiver_;
mojo::Binding<FlingingRendererClientExtension> client_extension_binding_; mojo::Receiver<FlingingRendererClientExtension> client_extension_receiver_{
this};
DISALLOW_COPY_AND_ASSIGN(FlingingRendererClient); DISALLOW_COPY_AND_ASSIGN(FlingingRendererClient);
}; };
......
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