Convert XRCompositorHost to new Mojo types

This CL converts XRCompositorHostPtr and Binding<XRCompositorHost>
in chrome and device to the new Mojo type, and use
pending_remote<XRCompositorHost> in isolated_xr_service.mojom.

Bug: 955171
Change-Id: Ib5d6f46f104b525806ef4363b944dc0c079917e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1847451
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Klaus Weidner <klausw@chromium.org>
Reviewed-by: Piotr Bialecki <bialpio@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#704646}

chrome/browser/vr/service/isolated_device_provider.cc

@@ -40,7 +40,7 @@ void IsolatedVRDeviceProvider::OnDeviceAdded(
     device::mojom::XRRuntimePtr device,
     mojo::PendingRemote<device::mojom::IsolatedXRGamepadProviderFactory>
         gamepad_factory,
-    device::mojom::XRCompositorHostPtr compositor_host,
+    mojo::PendingRemote<device::mojom::XRCompositorHost> compositor_host,
     device::mojom::XRDeviceId device_id) {
   add_device_callback_.Run(device_id, nullptr, std::move(device));
 

chrome/browser/vr/service/isolated_device_provider.h

@@ -42,7 +42,7 @@ class IsolatedVRDeviceProvider
       device::mojom::XRRuntimePtr device,
       mojo::PendingRemote<device::mojom::IsolatedXRGamepadProviderFactory>
           gamepad_factory,
-      device::mojom::XRCompositorHostPtr compositor_host,
+      mojo::PendingRemote<device::mojom::XRCompositorHost> compositor_host,
       device::mojom::XRDeviceId device_id) override;
   void OnDeviceRemoved(device::mojom::XRDeviceId id) override;
   void OnDevicesEnumerated() override;

chrome/browser/vr/service/vr_ui_host.h

@@ -8,6 +8,7 @@
 #include "chrome/browser/vr/vr_export.h"
 #include "device/vr/public/mojom/isolated_xr_service.mojom.h"
 #include "device/vr/public/mojom/vr_service.mojom.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
 
 namespace vr {
 
@@ -21,9 +22,9 @@ class VR_EXPORT VRUiHost {
  public:
   virtual ~VRUiHost() = 0;
 
-  using Factory =
-      std::unique_ptr<VRUiHost>(device::mojom::XRDeviceId device_id,
-                                device::mojom::XRCompositorHostPtr compositor);
+  using Factory = std::unique_ptr<VRUiHost>(
+      device::mojom::XRDeviceId device_id,
+      mojo::PendingRemote<device::mojom::XRCompositorHost> compositor);
 
   static void SetFactory(Factory* factory);
   static Factory* GetFactory();

chrome/browser/vr/ui_host/vr_ui_host_impl.cc

@@ -122,8 +122,9 @@ void VRUiHostImpl::CapturingStateModelTransience::
     *active_capture_state_model_ = CapturingStateModel();
 }
 
-VRUiHostImpl::VRUiHostImpl(device::mojom::XRDeviceId device_id,
-                           device::mojom::XRCompositorHostPtr compositor)
+VRUiHostImpl::VRUiHostImpl(
+    device::mojom::XRDeviceId device_id,
+    mojo::PendingRemote<device::mojom::XRCompositorHost> compositor)
     : compositor_(std::move(compositor)),
       main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       triggered_capturing_transience_(&triggered_capturing_state_model_) {
@@ -156,7 +157,7 @@ VRUiHostImpl::~VRUiHostImpl() {
 // static
 std::unique_ptr<VRUiHost> VRUiHostImpl::Create(
     device::mojom::XRDeviceId device_id,
-    device::mojom::XRCompositorHostPtr compositor) {
+    mojo::PendingRemote<device::mojom::XRCompositorHost> compositor) {
   DVLOG(1) << __func__;
   return std::make_unique<VRUiHostImpl>(device_id, std::move(compositor));
 }

chrome/browser/vr/ui_host/vr_ui_host_impl.h

@@ -17,6 +17,7 @@
 #include "chrome/browser/vr/service/vr_ui_host.h"
 #include "components/bubble/bubble_manager.h"
 #include "content/public/browser/web_contents.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/geolocation_config.mojom.h"
 
@@ -33,13 +34,13 @@ class VRUiHostImpl : public VRUiHost,
                      public DesktopMediaPickerManager::DialogObserver {
  public:
   VRUiHostImpl(device::mojom::XRDeviceId device_id,
-               device::mojom::XRCompositorHostPtr compositor);
+               mojo::PendingRemote<device::mojom::XRCompositorHost> compositor);
   ~VRUiHostImpl() override;
 
   // Factory for use with VRUiHost::{Set,Get}Factory
   static std::unique_ptr<VRUiHost> Create(
       device::mojom::XRDeviceId device_id,
-      device::mojom::XRCompositorHostPtr compositor);
+      mojo::PendingRemote<device::mojom::XRCompositorHost> compositor);
 
  private:
   // This class manages the transience of each of a CapturingStateModel's flags.
@@ -102,7 +103,7 @@ class VRUiHostImpl : public VRUiHost,
   void InitCapturingStates();
   void PollCapturingState();
 
-  device::mojom::XRCompositorHostPtr compositor_;
+  mojo::Remote<device::mojom::XRCompositorHost> compositor_;
   std::unique_ptr<VRBrowserRendererThreadWin> ui_rendering_thread_;
   device::mojom::VRDisplayInfoPtr info_;
   content::WebContents* web_contents_ = nullptr;

device/vr/oculus/oculus_device.cc

@@ -96,7 +96,6 @@ mojom::VRDisplayInfoPtr CreateVRDisplayInfo(mojom::XRDeviceId id,
 OculusDevice::OculusDevice()
     : VRDeviceBase(mojom::XRDeviceId::OCULUS_DEVICE_ID),
       main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
-      compositor_host_binding_(this),
       weak_ptr_factory_(this) {
   render_loop_ = std::make_unique<OculusRenderLoop>();
 }
@@ -116,10 +115,9 @@ OculusDevice::BindGamepadFactory() {
   return gamepad_provider_factory_receiver_.BindNewPipeAndPassRemote();
 }
 
-mojom::XRCompositorHostPtr OculusDevice::BindCompositorHost() {
-  mojom::XRCompositorHostPtr ret;
-  compositor_host_binding_.Bind(mojo::MakeRequest(&ret));
-  return ret;
+mojo::PendingRemote<mojom::XRCompositorHost>
+OculusDevice::BindCompositorHost() {
+  return compositor_host_receiver_.BindNewPipeAndPassRemote();
 }
 
 OculusDevice::~OculusDevice() {

device/vr/oculus/oculus_device.h

@@ -11,7 +11,6 @@
 #include "base/single_thread_task_runner.h"
 #include "device/vr/public/mojom/vr_service.mojom.h"
 #include "device/vr/vr_device_base.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
@@ -46,7 +45,7 @@ class DEVICE_VR_EXPORT OculusDevice
 
   mojo::PendingRemote<mojom::IsolatedXRGamepadProviderFactory>
   BindGamepadFactory();
-  mojom::XRCompositorHostPtr BindCompositorHost();
+  mojo::PendingRemote<mojom::XRCompositorHost> BindCompositorHost();
 
  private:
   // XRSessionController
@@ -80,7 +79,7 @@ class DEVICE_VR_EXPORT OculusDevice
       gamepad_provider_factory_receiver_{this};
   mojo::PendingReceiver<mojom::IsolatedXRGamepadProvider> provider_receiver_;
 
-  mojo::Binding<mojom::XRCompositorHost> compositor_host_binding_;
+  mojo::Receiver<mojom::XRCompositorHost> compositor_host_receiver_{this};
   mojo::PendingReceiver<mojom::ImmersiveOverlay> overlay_receiver_;
 
   base::WeakPtrFactory<OculusDevice> weak_ptr_factory_;

device/vr/openvr/openvr_device.cc

@@ -123,8 +123,7 @@ mojom::VRDisplayInfoPtr CreateVRDisplayInfo(vr::IVRSystem* vr_system,
 
 OpenVRDevice::OpenVRDevice()
     : VRDeviceBase(device::mojom::XRDeviceId::OPENVR_DEVICE_ID),
-      main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
-      compositor_host_binding_(this) {
+      main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {
   render_loop_ = std::make_unique<OpenVRRenderLoop>();
 
   OnPollingEvents();
@@ -143,10 +142,9 @@ OpenVRDevice::BindGamepadFactory() {
   return gamepad_provider_factory_receiver_.BindNewPipeAndPassRemote();
 }
 
-mojom::XRCompositorHostPtr OpenVRDevice::BindCompositorHost() {
-  mojom::XRCompositorHostPtr ret;
-  compositor_host_binding_.Bind(mojo::MakeRequest(&ret));
-  return ret;
+mojo::PendingRemote<mojom::XRCompositorHost>
+OpenVRDevice::BindCompositorHost() {
+  return compositor_host_receiver_.BindNewPipeAndPassRemote();
 }
 
 OpenVRDevice::~OpenVRDevice() {

device/vr/openvr/openvr_device.h

@@ -12,7 +12,6 @@
 #include "device/vr/openvr/openvr_api_wrapper.h"
 #include "device/vr/public/mojom/vr_service.mojom.h"
 #include "device/vr/vr_device_base.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
@@ -52,7 +51,7 @@ class DEVICE_VR_EXPORT OpenVRDevice
 
   mojo::PendingRemote<mojom::IsolatedXRGamepadProviderFactory>
   BindGamepadFactory();
-  mojom::XRCompositorHostPtr BindCompositorHost();
+  mojo::PendingRemote<mojom::XRCompositorHost> BindCompositorHost();
 
  private:
   // XRSessionController
@@ -84,7 +83,7 @@ class DEVICE_VR_EXPORT OpenVRDevice
       gamepad_provider_factory_receiver_{this};
   mojo::PendingReceiver<mojom::IsolatedXRGamepadProvider> provider_receiver_;
 
-  mojo::Binding<mojom::XRCompositorHost> compositor_host_binding_;
+  mojo::Receiver<mojom::XRCompositorHost> compositor_host_receiver_{this};
   mojo::PendingReceiver<mojom::ImmersiveOverlay> overlay_receiver_;
 
   base::WeakPtrFactory<OpenVRDevice> weak_ptr_factory_{this};

device/vr/openxr/openxr_device.cc

@@ -86,7 +86,6 @@ bool OpenXrDevice::IsApiAvailable() {
 
 OpenXrDevice::OpenXrDevice()
     : VRDeviceBase(device::mojom::XRDeviceId::OPENXR_DEVICE_ID),
-      compositor_host_binding_(this),
       weak_ptr_factory_(this) {
   SetVRDisplayInfo(CreateFakeVRDisplayInfo(GetId()));
 }
@@ -105,10 +104,9 @@ OpenXrDevice::BindGamepadFactory() {
   return gamepad_provider_factory_receiver_.BindNewPipeAndPassRemote();
 }
 
-mojom::XRCompositorHostPtr OpenXrDevice::BindCompositorHost() {
-  mojom::XRCompositorHostPtr ret;
-  compositor_host_binding_.Bind(mojo::MakeRequest(&ret));
-  return ret;
+mojo::PendingRemote<mojom::XRCompositorHost>
+OpenXrDevice::BindCompositorHost() {
+  return compositor_host_receiver_.BindNewPipeAndPassRemote();
 }
 
 void OpenXrDevice::EnsureRenderLoop() {

device/vr/openxr/openxr_device.h

@@ -37,7 +37,7 @@ class DEVICE_VR_EXPORT OpenXrDevice
 
   mojo::PendingRemote<mojom::IsolatedXRGamepadProviderFactory>
   BindGamepadFactory();
-  mojom::XRCompositorHostPtr BindCompositorHost();
+  mojo::PendingRemote<mojom::XRCompositorHost> BindCompositorHost();
 
  private:
   // XRSessionController
@@ -68,7 +68,7 @@ class DEVICE_VR_EXPORT OpenXrDevice
       gamepad_provider_factory_receiver_{this};
   mojo::PendingReceiver<mojom::IsolatedXRGamepadProvider> provider_receiver_;
 
-  mojo::Binding<mojom::XRCompositorHost> compositor_host_binding_;
+  mojo::Receiver<mojom::XRCompositorHost> compositor_host_receiver_{this};
   mojo::PendingReceiver<mojom::ImmersiveOverlay> overlay_receiver_;
 
   base::WeakPtrFactory<OpenXrDevice> weak_ptr_factory_;

device/vr/public/mojom/isolated_xr_service.mojom

@@ -199,7 +199,7 @@ interface IsolatedXRRuntimeProviderClient {
   // attached and become available.
   OnDeviceAdded(XRRuntime runtime,
       pending_remote<IsolatedXRGamepadProviderFactory> gamepad_factory,
-      XRCompositorHost compositor_host,
+      pending_remote<XRCompositorHost> compositor_host,
       device.mojom.XRDeviceId device_id);
 
   // Called when runtimes become unavailable - for example if the hardware is

device/vr/windows_mixed_reality/mixed_reality_device.cc

@@ -62,8 +62,7 @@ mojom::VRDisplayInfoPtr CreateFakeVRDisplayInfo(device::mojom::XRDeviceId id) {
 }  // namespace
 
 MixedRealityDevice::MixedRealityDevice()
-    : VRDeviceBase(device::mojom::XRDeviceId::WINDOWS_MIXED_REALITY_ID),
-      compositor_host_binding_(this) {
+    : VRDeviceBase(device::mojom::XRDeviceId::WINDOWS_MIXED_REALITY_ID) {
   SetVRDisplayInfo(CreateFakeVRDisplayInfo(GetId()));
 }
 
@@ -76,10 +75,9 @@ MixedRealityDevice::BindGamepadFactory() {
   return gamepad_provider_factory_receiver_.BindNewPipeAndPassRemote();
 }
 
-mojom::XRCompositorHostPtr MixedRealityDevice::BindCompositorHost() {
-  mojom::XRCompositorHostPtr ret;
-  compositor_host_binding_.Bind(mojo::MakeRequest(&ret));
-  return ret;
+mojo::PendingRemote<mojom::XRCompositorHost>
+MixedRealityDevice::BindCompositorHost() {
+  return compositor_host_receiver_.BindNewPipeAndPassRemote();
 }
 
 void MixedRealityDevice::RequestSession(

device/vr/windows_mixed_reality/mixed_reality_device.h

@@ -13,7 +13,6 @@
 #include "device/vr/public/mojom/vr_service.mojom.h"
 #include "device/vr/vr_device_base.h"
 #include "device/vr/windows/compositor_base.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
@@ -31,7 +30,7 @@ class DEVICE_VR_EXPORT MixedRealityDevice
 
   mojo::PendingRemote<mojom::IsolatedXRGamepadProviderFactory>
   BindGamepadFactory();
-  mojom::XRCompositorHostPtr BindCompositorHost();
+  mojo::PendingRemote<mojom::XRCompositorHost> BindCompositorHost();
 
  private:
   // VRDeviceBase
@@ -65,7 +64,7 @@ class DEVICE_VR_EXPORT MixedRealityDevice
       gamepad_provider_factory_receiver_{this};
   mojo::PendingReceiver<mojom::IsolatedXRGamepadProvider> provider_receiver_;
 
-  mojo::Binding<mojom::XRCompositorHost> compositor_host_binding_;
+  mojo::Receiver<mojom::XRCompositorHost> compositor_host_receiver_{this};
   mojo::PendingReceiver<mojom::ImmersiveOverlay> overlay_receiver_;
 
   mojo::Receiver<mojom::XRSessionController> exclusive_controller_receiver_{