Migrate DisplayClient to the new Mojo types

This CL applies pending_receiver to CreateLayeredWindowUpdater
in DisplayClient. According to the change, related classes
are also changed with mojo::PendingReceiver, mojo::PendingRemote,
and mojo::Remote.

Bug: 955171
Change-Id: Ib40de7fdf35bace79e97d1aa8a5f55e8c7c414b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824792Reviewed-by: vmpstr <vmpstr@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#700045}

components/viz/host/host_display_client.cc

@@ -48,14 +48,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
 
 #if defined(OS_WIN)
 void HostDisplayClient::CreateLayeredWindowUpdater(
-    mojom::LayeredWindowUpdaterRequest request) {
+    mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) {
   if (!NeedsToUseLayerWindow(widget_)) {
     DLOG(ERROR) << "HWND shouldn't be using a layered window";
     return;
   }
 
   layered_window_updater_ =
-      std::make_unique<LayeredWindowUpdaterImpl>(widget_, std::move(request));
+      std::make_unique<LayeredWindowUpdaterImpl>(widget_, std::move(receiver));
 }
 #endif
 

components/viz/host/host_display_client.h

@@ -39,7 +39,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
 
 #if defined(OS_WIN)
   void CreateLayeredWindowUpdater(
-      mojom::LayeredWindowUpdaterRequest request) override;
+      mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;
 #endif
 
 #if defined(USE_X11)

components/viz/host/layered_window_updater_impl.cc

@@ -15,8 +15,8 @@ namespace viz {
 
 LayeredWindowUpdaterImpl::LayeredWindowUpdaterImpl(
     HWND hwnd,
-    mojom::LayeredWindowUpdaterRequest request)
-    : hwnd_(hwnd), binding_(this, std::move(request)) {}
+    mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver)
+    : hwnd_(hwnd), receiver_(this, std::move(receiver)) {}
 
 LayeredWindowUpdaterImpl::~LayeredWindowUpdaterImpl() = default;
 

components/viz/host/layered_window_updater_impl.h

@@ -12,7 +12,8 @@
 #include "base/macros.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "components/viz/host/viz_host_export.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "services/viz/privileged/mojom/compositing/layered_window_updater.mojom.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -26,8 +27,9 @@ namespace viz {
 class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl
     : public mojom::LayeredWindowUpdater {
  public:
-  LayeredWindowUpdaterImpl(HWND hwnd,
-                           mojom::LayeredWindowUpdaterRequest request);
+  LayeredWindowUpdaterImpl(
+      HWND hwnd,
+      mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver);
   ~LayeredWindowUpdaterImpl() override;
 
   // mojom::LayeredWindowUpdater implementation.
@@ -37,7 +39,7 @@ class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl
 
  private:
   const HWND hwnd_;
-  mojo::Binding<mojom::LayeredWindowUpdater> binding_;
+  mojo::Receiver<mojom::LayeredWindowUpdater> receiver_;
   std::unique_ptr<SkCanvas> canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(LayeredWindowUpdaterImpl);

components/viz/service/display_embedder/software_output_device_win.cc

@@ -11,6 +11,8 @@
 #include "components/viz/common/display/use_layered_window.h"
 #include "components/viz/common/resources/resource_sizes.h"
 #include "components/viz/service/display_embedder/output_device_backing.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "services/viz/privileged/mojom/compositing/layered_window_updater.mojom.h"
 #include "skia/ext/platform_canvas.h"
@@ -179,7 +181,7 @@ class SoftwareOutputDeviceWinProxy : public SoftwareOutputDeviceWinBase {
  public:
   SoftwareOutputDeviceWinProxy(
       HWND hwnd,
-      mojom::LayeredWindowUpdaterPtr layered_window_updater);
+      mojo::PendingRemote<mojom::LayeredWindowUpdater> layered_window_updater);
   ~SoftwareOutputDeviceWinProxy() override = default;
 
   // SoftwareOutputDevice implementation.
@@ -194,7 +196,7 @@ class SoftwareOutputDeviceWinProxy : public SoftwareOutputDeviceWinBase {
   // Runs |swap_ack_callback_| after draw has happened.
   void DrawAck();
 
-  mojom::LayeredWindowUpdaterPtr layered_window_updater_;
+  mojo::Remote<mojom::LayeredWindowUpdater> layered_window_updater_;
 
   std::unique_ptr<SkCanvas> canvas_;
   bool waiting_on_draw_ack_ = false;
@@ -205,7 +207,7 @@ class SoftwareOutputDeviceWinProxy : public SoftwareOutputDeviceWinBase {
 
 SoftwareOutputDeviceWinProxy::SoftwareOutputDeviceWinProxy(
     HWND hwnd,
-    mojom::LayeredWindowUpdaterPtr layered_window_updater)
+    mojo::PendingRemote<mojom::LayeredWindowUpdater> layered_window_updater)
     : SoftwareOutputDeviceWinBase(hwnd),
       layered_window_updater_(std::move(layered_window_updater)) {
   DCHECK(layered_window_updater_.is_bound());
@@ -293,9 +295,9 @@ std::unique_ptr<SoftwareOutputDevice> CreateSoftwareOutputDeviceWin(
 
     // Setup mojom::LayeredWindowUpdater implementation in the browser process
     // to draw to the HWND.
-    mojom::LayeredWindowUpdaterPtr layered_window_updater;
+    mojo::PendingRemote<mojom::LayeredWindowUpdater> layered_window_updater;
     display_client->CreateLayeredWindowUpdater(
-        mojo::MakeRequest(&layered_window_updater));
+        layered_window_updater.InitWithNewPipeAndPassReceiver());
 
     return std::make_unique<SoftwareOutputDeviceWinProxy>(
         hwnd, std::move(layered_window_updater));

components/viz/test/fake_display_client.cc

@@ -22,7 +22,7 @@ void FakeDisplayClient::OnDisplayReceivedCALayerParams(
 
 #if defined(OS_WIN)
 void FakeDisplayClient::CreateLayeredWindowUpdater(
-    mojom::LayeredWindowUpdaterRequest request) {}
+    mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) {}
 #endif
 
 #if defined(USE_X11)

components/viz/test/fake_display_client.h

@@ -28,7 +28,7 @@ class FakeDisplayClient : public mojom::DisplayClient {
 
 #if defined(OS_WIN)
   void CreateLayeredWindowUpdater(
-      mojom::LayeredWindowUpdaterRequest request) override;
+      mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;
 #endif
 
 #if defined(USE_X11)

components/viz/test/mock_display_client.h

@@ -8,6 +8,7 @@
 #include "build/build_config.h"
 #include "gpu/command_buffer/common/context_result.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/viz/privileged/mojom/compositing/frame_sink_manager.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -26,7 +27,7 @@ class MockDisplayClient : public mojom::DisplayClient {
 #endif
 #if defined(OS_WIN)
   MOCK_METHOD1(CreateLayeredWindowUpdater,
-               void(mojom::LayeredWindowUpdaterRequest));
+               void(mojo::PendingReceiver<mojom::LayeredWindowUpdater>));
 #endif
 #if defined(OS_ANDROID)
   MOCK_METHOD1(DidCompleteSwapWithSize, void(const gfx::Size&));

services/viz/privileged/mojom/compositing/display_private.mojom

@@ -85,7 +85,7 @@ interface DisplayClient {
   // Creates a LayeredWindowUpdater implementation to draw into a layered
   // window.
   [EnableIf=is_win]
-  CreateLayeredWindowUpdater(LayeredWindowUpdater& layered_window_updater);
+  CreateLayeredWindowUpdater(pending_receiver<LayeredWindowUpdater> receiver);
 
   // Notifies that a swap has occurred and provides information about the pixel
   // size of the swapped frame.