Commit bbe7ea0f authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Convert MemoryPressureController to new Mojo types

This CL converts MemoryPressureControllerPtr and
MemoryPressureControllerRequest to new Mojo types.

Bug: 955171
Change-Id: I84464e08ac4be2c3051343a65160b4c02062cc13
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1788963
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: default avatarLuke Halliwell <halliwell@chromium.org>
Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695891}
parent fe2bba2d
......@@ -747,7 +747,7 @@ void CastContentBrowserClient::ExposeInterfacesToRenderer(
}
registry->AddInterface(
base::Bind(&MemoryPressureControllerImpl::AddBinding,
base::Bind(&MemoryPressureControllerImpl::AddReceiver,
base::Unretained(memory_pressure_controller_.get())),
base::ThreadTaskRunnerHandle::Get());
#endif // !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
......
......@@ -17,9 +17,9 @@ MemoryPressureControllerImpl::MemoryPressureControllerImpl() {
MemoryPressureControllerImpl::~MemoryPressureControllerImpl() = default;
void MemoryPressureControllerImpl::AddBinding(
mojom::MemoryPressureControllerRequest request) {
bindings_.AddBinding(this, std::move(request));
void MemoryPressureControllerImpl::AddReceiver(
mojo::PendingReceiver<mojom::MemoryPressureController> receiver) {
receivers_.Add(this, std::move(receiver));
}
void MemoryPressureControllerImpl::OnMemoryPressure(
......
......@@ -8,8 +8,8 @@
#include "base/macros.h"
#include "base/memory/memory_pressure_listener.h"
#include "chromecast/common/mojom/memory_pressure.mojom.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"
namespace chromecast {
......@@ -19,7 +19,8 @@ class MemoryPressureControllerImpl : public mojom::MemoryPressureController {
MemoryPressureControllerImpl();
~MemoryPressureControllerImpl() override;
void AddBinding(mojom::MemoryPressureControllerRequest request);
void AddReceiver(
mojo::PendingReceiver<mojom::MemoryPressureController> receiver);
private:
// chromecast::mojom::MemoryPressure implementation.
......@@ -30,7 +31,7 @@ class MemoryPressureControllerImpl : public mojom::MemoryPressureController {
base::MemoryPressureListener::MemoryPressureLevel level);
mojo::RemoteSet<mojom::MemoryPressureObserver> observers_;
mojo::BindingSet<mojom::MemoryPressureController> bindings_;
mojo::ReceiverSet<mojom::MemoryPressureController> receivers_;
std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
......
......@@ -30,6 +30,7 @@
#include "media/base/media.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/blink/public/platform/web_runtime_features.h"
#include "third_party/blink/public/web/web_frame_widget.h"
......@@ -107,8 +108,10 @@ void CastContentRendererClient::RenderThreadStarted() {
#if !defined(OS_ANDROID)
// Register to observe memory pressure changes
chromecast::mojom::MemoryPressureControllerPtr memory_pressure_controller;
thread->BindHostReceiver(mojo::MakeRequest(&memory_pressure_controller));
mojo::Remote<chromecast::mojom::MemoryPressureController>
memory_pressure_controller;
thread->BindHostReceiver(
memory_pressure_controller.BindNewPipeAndPassReceiver());
mojo::PendingRemote<chromecast::mojom::MemoryPressureObserver>
memory_pressure_proxy;
memory_pressure_observer_.reset(
......
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