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

Clean up old Mojo type for mojom::RendererHost

This CL cleans up old mojo types for mojom::RendererHost.
It uses AssociatedRemote and AssociatedReceiver instead
of RendererHostAssociatedPtr and AssociatedBinding.

Bug: 955171
Change-Id: If977953c0cecfa6462b01fc4f51612411fdca2a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1872579Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#708891}
parent 0e97852c
...@@ -1470,7 +1470,6 @@ RenderProcessHostImpl::RenderProcessHostImpl( ...@@ -1470,7 +1470,6 @@ RenderProcessHostImpl::RenderProcessHostImpl(
nullptr, nullptr,
base::OnTaskRunnerDeleter(base::CreateSequencedTaskRunner( base::OnTaskRunnerDeleter(base::CreateSequencedTaskRunner(
{ServiceWorkerContext::GetCoreThreadId()}))), {ServiceWorkerContext::GetCoreThreadId()}))),
renderer_host_binding_(this),
instance_weak_factory_(base::in_place, this), instance_weak_factory_(base::in_place, this),
frame_sink_provider_(id_), frame_sink_provider_(id_),
shutdown_exit_code_(-1) { shutdown_exit_code_(-1) {
...@@ -2368,7 +2367,7 @@ void RenderProcessHostImpl::RegisterCoordinatorClient( ...@@ -2368,7 +2367,7 @@ void RenderProcessHostImpl::RegisterCoordinatorClient(
void RenderProcessHostImpl::CreateRendererHost( void RenderProcessHostImpl::CreateRendererHost(
mojo::PendingAssociatedReceiver<mojom::RendererHost> receiver) { mojo::PendingAssociatedReceiver<mojom::RendererHost> receiver) {
renderer_host_binding_.Bind(std::move(receiver)); renderer_host_receiver_.Bind(std::move(receiver));
} }
int RenderProcessHostImpl::GetNextRoutingID() { int RenderProcessHostImpl::GetNextRoutingID() {
...@@ -4307,9 +4306,7 @@ void RenderProcessHostImpl::ProcessDied( ...@@ -4307,9 +4306,7 @@ void RenderProcessHostImpl::ProcessDied(
} }
void RenderProcessHostImpl::ResetIPC() { void RenderProcessHostImpl::ResetIPC() {
if (renderer_host_binding_.is_bound()) renderer_host_receiver_.reset();
renderer_host_binding_.Unbind();
io_thread_host_impl_.reset(); io_thread_host_impl_.reset();
route_provider_receiver_.reset(); route_provider_receiver_.reset();
associated_interface_provider_receivers_.Clear(); associated_interface_provider_receivers_.Clear();
......
...@@ -1020,7 +1020,7 @@ class CONTENT_EXPORT RenderProcessHostImpl ...@@ -1020,7 +1020,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
mojo::Remote<mojom::ChildProcess> child_process_; mojo::Remote<mojom::ChildProcess> child_process_;
mojo::AssociatedRemote<mojom::RouteProvider> remote_route_provider_; mojo::AssociatedRemote<mojom::RouteProvider> remote_route_provider_;
mojo::AssociatedRemote<mojom::Renderer> renderer_interface_; mojo::AssociatedRemote<mojom::Renderer> renderer_interface_;
mojo::AssociatedBinding<mojom::RendererHost> renderer_host_binding_; mojo::AssociatedReceiver<mojom::RendererHost> renderer_host_receiver_{this};
mojo::Receiver<memory_instrumentation::mojom::CoordinatorConnector> mojo::Receiver<memory_instrumentation::mojom::CoordinatorConnector>
coordinator_connector_receiver_{this}; coordinator_connector_receiver_{this};
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "ipc/ipc_sync_channel.h" #include "ipc/ipc_sync_channel.h"
#include "media/media_buildflags.h" #include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/associated_receiver.h"
#include "mojo/public/cpp/bindings/associated_remote.h"
#include "mojo/public/cpp/bindings/pending_associated_receiver.h" #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
#include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/pending_remote.h"
...@@ -672,7 +673,7 @@ class CONTENT_EXPORT RenderThreadImpl ...@@ -672,7 +673,7 @@ class CONTENT_EXPORT RenderThreadImpl
std::map<int, scoped_refptr<PendingFrameCreate>>; std::map<int, scoped_refptr<PendingFrameCreate>>;
PendingFrameCreateMap pending_frame_creates_; PendingFrameCreateMap pending_frame_creates_;
mojom::RendererHostAssociatedPtr renderer_host_; mojo::AssociatedRemote<mojom::RendererHost> renderer_host_;
blink::AssociatedInterfaceRegistry associated_interfaces_; blink::AssociatedInterfaceRegistry associated_interfaces_;
......
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