Commit 11f483a1 authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Change BindingSet with ReceiverSet in CompositingModeReporterImpl

This CL converts BindingSet to ReceiverSet in CompositingModeReporterImpl.
According to the change, |bindings| is changed to |receivers| and
BindingRequest() is changed to BindReceiver() as well.

Bug: 955171
Change-Id: I69d2a4f05101ac1c92a844fe5c5946099a4c6205
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803939
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697453}
parent 0bf0e825
......@@ -10,9 +10,9 @@ CompositingModeReporterImpl::CompositingModeReporterImpl() = default;
CompositingModeReporterImpl::~CompositingModeReporterImpl() = default;
void CompositingModeReporterImpl::BindRequest(
mojom::CompositingModeReporterRequest request) {
bindings_.AddBinding(this, std::move(request));
void CompositingModeReporterImpl::BindReceiver(
mojo::PendingReceiver<mojom::CompositingModeReporter> receiver) {
receivers_.Add(this, std::move(receiver));
}
void CompositingModeReporterImpl::SetUsingSoftwareCompositing() {
......
......@@ -7,8 +7,8 @@
#include "base/macros.h"
#include "components/viz/service/viz_service_export.h"
#include "mojo/public/cpp/bindings/binding_set.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 "services/viz/public/mojom/compositing/compositing_mode_watcher.mojom.h"
......@@ -23,8 +23,9 @@ class VIZ_SERVICE_EXPORT CompositingModeReporterImpl
~CompositingModeReporterImpl() override;
// Called for each consumer of the CompositingModeReporter interface, to
// fulfill a mojo pointer for them.
void BindRequest(mojom::CompositingModeReporterRequest request);
// bind a receiver for them.
void BindReceiver(
mojo::PendingReceiver<mojom::CompositingModeReporter> receiver);
// Call to inform the reporter that software compositing is being used instead
// of gpu. This is a one-way setting that can not be reverted. This will
......@@ -37,7 +38,7 @@ class VIZ_SERVICE_EXPORT CompositingModeReporterImpl
private:
bool gpu_ = true;
mojo::BindingSet<mojom::CompositingModeReporter> bindings_;
mojo::ReceiverSet<mojom::CompositingModeReporter> receivers_;
mojo::RemoteSet<mojom::CompositingModeWatcher> watchers_;
};
......
......@@ -1193,13 +1193,13 @@ viz::ServerSharedBitmapManager* BrowserMainLoop::GetServerSharedBitmapManager()
#endif
void BrowserMainLoop::GetCompositingModeReporter(
viz::mojom::CompositingModeReporterRequest request) {
mojo::PendingReceiver<viz::mojom::CompositingModeReporter> receiver) {
#if defined(OS_ANDROID)
// Android doesn't support non-gpu compositing modes, and doesn't make a
// CompositingModeReporter.
return;
#else
compositing_mode_reporter_impl_->BindRequest(std::move(request));
compositing_mode_reporter_impl_->BindReceiver(std::move(receiver));
#endif
}
......
......@@ -217,9 +217,9 @@ class CONTENT_EXPORT BrowserMainLoop {
viz::ServerSharedBitmapManager* GetServerSharedBitmapManager() const;
#endif
// Fulfills a mojo pointer to the singleton CompositingModeReporter.
// Binds a receiver to the singleton CompositingModeReporter.
void GetCompositingModeReporter(
viz::mojom::CompositingModeReporterRequest request);
mojo::PendingReceiver<viz::mojom::CompositingModeReporter> receiver);
#if defined(OS_MACOSX) && !defined(OS_IOS)
media::DeviceMonitorMac* device_monitor_mac() const {
......
......@@ -2240,9 +2240,9 @@ void RenderProcessHostImpl::BindFrameSinkProvider(
}
void RenderProcessHostImpl::BindCompositingModeReporter(
viz::mojom::CompositingModeReporterRequest request) {
mojo::PendingReceiver<viz::mojom::CompositingModeReporter> receiver) {
BrowserMainLoop::GetInstance()->GetCompositingModeReporter(
std::move(request));
std::move(receiver));
}
void RenderProcessHostImpl::CreateStoragePartitionService(
......
......@@ -592,7 +592,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
void BindFrameSinkProvider(
mojo::PendingReceiver<mojom::FrameSinkProvider> receiver);
void BindCompositingModeReporter(
viz::mojom::CompositingModeReporterRequest request);
mojo::PendingReceiver<viz::mojom::CompositingModeReporter> receiver);
void CreateStoragePartitionService(
mojo::PendingReceiver<blink::mojom::StoragePartitionService> receiver);
void CreateBroadcastChannelProvider(
......
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