Commit 827caa10 authored by Miyoung Shin's avatar Miyoung Shin Committed by Commit Bot

Convert CameraHalDispatcher to new Mojo types

This CL converts CameraHalDispatcherRequest and
BindingSet<CameraHalDispatcher> in media to the new Mojo type.

Bug: 955171
Change-Id: I2345178fc387d0db1b2b3b43d787d439ac517404
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863090
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Reviewed-by: default avatarRicky Liang <jcliang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707311}
parent cc67fc68
......@@ -367,8 +367,9 @@ void CameraHalDispatcherImpl::EstablishMojoChannel(
void CameraHalDispatcherImpl::OnPeerConnected(
mojo::ScopedMessagePipeHandle message_pipe) {
DCHECK(proxy_task_runner_->BelongsToCurrentThread());
binding_set_.AddBinding(
this, cros::mojom::CameraHalDispatcherRequest(std::move(message_pipe)));
receiver_set_.Add(this,
mojo::PendingReceiver<cros::mojom::CameraHalDispatcher>(
std::move(message_pipe)));
VLOG(1) << "New CameraHalDispatcher binding added";
}
......@@ -398,7 +399,7 @@ void CameraHalDispatcherImpl::StopOnProxyThread() {
cancel_pipe_.reset();
client_observers_.clear();
camera_hal_server_.reset();
binding_set_.CloseAllBindings();
receiver_set_.Clear();
}
void CameraHalDispatcherImpl::OnTraceLogEnabledOnProxyThread() {
......
......@@ -18,9 +18,9 @@
#include "media/capture/video/chromeos/mojom/cros_camera_service.mojom.h"
#include "media/capture/video/chromeos/video_capture_device_factory_chromeos.h"
#include "media/capture/video/video_capture_device_factory.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/platform/platform_channel_server_endpoint.h"
......@@ -126,7 +126,7 @@ class CAPTURE_EXPORT CameraHalDispatcherImpl final
scoped_refptr<base::SingleThreadTaskRunner> proxy_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> blocking_io_task_runner_;
mojo::BindingSet<cros::mojom::CameraHalDispatcher> binding_set_;
mojo::ReceiverSet<cros::mojom::CameraHalDispatcher> receiver_set_;
mojo::Remote<cros::mojom::CameraHalServer> camera_hal_server_;
......
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