Convert XRPresentationClient to new Mojo types

This CL converts XRPresentationClientPtr in chrome, device and
blink to the new Mojo type, and uses
pending_receiver<XRPresentationClient> in vr_service.mojom.

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

chrome/browser/android/vr/arcore_device/arcore_gl.cc

@@ -202,7 +202,8 @@ void ArCoreGl::CreateSession(mojom::VRDisplayInfoPtr display_info,
       device::mojom::XRPresentationTransportMethod::DRAW_INTO_TEXTURE_MAILBOX;
 
   auto submit_frame_sink = device::mojom::XRPresentationConnection::New();
-  submit_frame_sink->client_request = mojo::MakeRequest(&submit_client_);
+  submit_frame_sink->client_receiver =
+      submit_client_.BindNewPipeAndPassReceiver();
   submit_frame_sink->provider = presentation_provider.PassInterface();
   submit_frame_sink->transport_options = std::move(transport_options);
 

chrome/browser/android/vr/arcore_device/arcore_gl.h

@@ -19,6 +19,7 @@
 #include "device/vr/util/fps_meter.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "ui/display/display.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/quaternion.h"
@@ -200,7 +201,7 @@ class ArCoreGl : public mojom::XRFrameDataProvider,
   void CloseBindingsIfOpen();
 
   mojo::Binding<device::mojom::XRPresentationProvider> presentation_binding_;
-  device::mojom::XRPresentationClientPtr submit_client_;
+  mojo::Remote<device::mojom::XRPresentationClient> submit_client_;
 
   base::OnceClosure pending_getframedata_;
 

chrome/browser/android/vr/gvr_scheduler_delegate.cc

@@ -196,7 +196,8 @@ void GvrSchedulerDelegate::ConnectPresentingService(
   }
 
   auto submit_frame_sink = device::mojom::XRPresentationConnection::New();
-  submit_frame_sink->client_request = mojo::MakeRequest(&submit_client_);
+  submit_frame_sink->client_receiver =
+      submit_client_.BindNewPipeAndPassReceiver();
   submit_frame_sink->provider = presentation_provider.PassInterface();
   submit_frame_sink->transport_options = std::move(transport_options);
 

chrome/browser/android/vr/gvr_scheduler_delegate.h

@@ -21,6 +21,7 @@
 #include "device/vr/public/mojom/vr_service.mojom.h"
 #include "device/vr/util/sliding_average.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
@@ -194,7 +195,7 @@ class GvrSchedulerDelegate : public BaseSchedulerDelegate,
   mojo::Binding<device::mojom::XRFrameDataProvider> frame_data_binding_;
 
   std::vector<device::mojom::XRInputSourceStatePtr> input_states_;
-  device::mojom::XRPresentationClientPtr submit_client_;
+  mojo::Remote<device::mojom::XRPresentationClient> submit_client_;
   base::queue<uint16_t> pending_frames_;
 
   base::queue<std::pair<WebXrPresentationState::FrameIndexType, WebVrBounds>>

device/vr/public/mojom/vr_service.mojom

@@ -108,7 +108,7 @@ struct XRSession {
 // frames to a sink outside of Chrome.
 struct XRPresentationConnection {
   XRPresentationProvider provider;
-  XRPresentationClient& client_request;
+  pending_receiver<XRPresentationClient> client_receiver;
   XRPresentationTransportOptions transport_options;
 };
 

device/vr/windows/compositor_base.cc

@@ -136,7 +136,7 @@ void XRCompositorCommon::SubmitFrameWithTextureHandle(
 }
 
 void XRCompositorCommon::CleanUp() {
-  submit_client_ = nullptr;
+  submit_client_.reset();
   webxr_has_pose_ = false;
   presentation_binding_.Close();
   frame_data_binding_.Close();
@@ -234,7 +234,8 @@ void XRCompositorCommon::RequestSession(
 
   auto submit_frame_sink = device::mojom::XRPresentationConnection::New();
   submit_frame_sink->provider = presentation_provider.PassInterface();
-  submit_frame_sink->client_request = mojo::MakeRequest(&submit_client_);
+  submit_frame_sink->client_receiver =
+      submit_client_.BindNewPipeAndPassReceiver();
   submit_frame_sink->transport_options = std::move(transport_options);
 
   auto session = device::mojom::XRSession::New();
@@ -255,7 +256,7 @@ void XRCompositorCommon::ExitPresent() {
   webxr_has_pose_ = false;
   presentation_binding_.Close();
   frame_data_binding_.Close();
-  submit_client_ = nullptr;
+  submit_client_.reset();
   StopRuntime();
 
   pending_frame_.reset();

device/vr/windows/compositor_base.h

@@ -14,6 +14,7 @@
 #include "device/vr/util/sliding_average.h"
 #include "device/vr/vr_device.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "ui/gfx/geometry/rect_f.h"
 
@@ -169,7 +170,7 @@ class XRCompositorCommon : public base::Thread,
   gfx::RectF right_webxr_bounds_;
   gfx::Size source_size_;
 
-  mojom::XRPresentationClientPtr submit_client_;
+  mojo::Remote<mojom::XRPresentationClient> submit_client_;
   SubmitOverlayTextureCallback overlay_submit_callback_;
   RequestNotificationOnWebXrSubmittedCallback on_webxr_submitted_;
   bool webxr_has_pose_ = false;

third_party/blink/renderer/modules/vr/vr_display.cc

@@ -576,7 +576,7 @@ void VRDisplay::OnRequestImmersiveSessionReturned(
 
     frame_transport_ = MakeGarbageCollected<XRFrameTransport>();
     frame_transport_->BindSubmitFrameClient(
-        std::move(session->submit_frame_sink->client_request));
+        std::move(session->submit_frame_sink->client_receiver));
     frame_transport_->SetTransportOptions(
         std::move(session->submit_frame_sink->transport_options));
 

third_party/blink/renderer/modules/xr/xr_frame_provider.cc

@@ -89,7 +89,7 @@ void XRFrameProvider::BeginImmersiveSession(
       &XRFrameProvider::OnProviderConnectionError, WrapWeakPersistent(this)));
 
   frame_transport_->BindSubmitFrameClient(
-      std::move(session_ptr->submit_frame_sink->client_request));
+      std::move(session_ptr->submit_frame_sink->client_receiver));
   frame_transport_->SetTransportOptions(
       std::move(session_ptr->submit_frame_sink->transport_options));
   frame_transport_->PresentChange();

third_party/blink/renderer/modules/xr/xr_frame_provider.h

@@ -26,7 +26,6 @@ class XRFrameProvider final : public GarbageCollected<XRFrameProvider> {
   explicit XRFrameProvider(XR*);
 
   XRSession* immersive_session() const { return immersive_session_; }
-  device::mojom::blink::XRPresentationClientPtr GetSubmitFrameClient();
 
   void BeginImmersiveSession(XRSession* session,
                              device::mojom::blink::XRSessionPtr session_ptr);

third_party/blink/web_tests/external/wpt/resources/chromium/webxr-test.js

@@ -574,7 +574,7 @@ class MockRuntime {
       let submit_frame_sink;
       if (result.supportsSession) {
         submit_frame_sink = {
-          clientRequest: this.presentation_provider_.getClientRequest(),
+          clientReceiver: this.presentation_provider_.getClientReceiver(),
           provider: this.presentation_provider_.bindProvider(sessionOptions),
           transportOptions: options
         };
@@ -957,7 +957,7 @@ class MockXRPresentationProvider {
     return providerPtr;
   }
 
-  getClientRequest() {
+  getClientReceiver() {
     this.submitFrameClient_ = new device.mojom.XRPresentationClientPtr();
     return mojo.makeRequest(this.submitFrameClient_);
   }