Bug 1858627 - Use ManagedEndpoint for PClipboardReadRequest construct…

…ion; r=nika Differential Revision: https://phabricator.services.mozilla.com/D201657
dothq · Mar 13, 2024 · 5c139ae · 5c139ae
1 parent ff6e638
commit 5c139ae
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 39 deletions.
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
@@ -1984,12 +1984,6 @@ PRemotePrintJobChild* ContentChild::AllocPRemotePrintJobChild() {
 #endif
 }
 
-already_AddRefed<PClipboardReadRequestChild>
-ContentChild::AllocPClipboardReadRequestChild(
-    const nsTArray<nsCString>& aTypes) {
-  return MakeAndAddRef<ClipboardReadRequestChild>(aTypes);
-}
-
 media::PMediaChild* ContentChild::AllocPMediaChild() {
   return media::AllocPMediaChild();
 }

diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
@@ -227,9 +227,6 @@ class ContentChild final : public PContentChild,
 
   PRemotePrintJobChild* AllocPRemotePrintJobChild();
 
-  already_AddRefed<PClipboardReadRequestChild> AllocPClipboardReadRequestChild(
-      const nsTArray<nsCString>& aTypes);
-
   PMediaChild* AllocPMediaChild();
 
   bool DeallocPMediaChild(PMediaChild* aActor);

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -3540,6 +3540,28 @@ mozilla::ipc::IPCResult ContentParent::RecvGetExternalClipboardFormats(
 
 namespace {
 
+static Result<ClipboardReadRequest, nsresult> CreateClipboardReadRequest(
+    ContentParent& aContentParent,
+    nsIAsyncGetClipboardData& aAsyncGetClipboardData) {
+  nsTArray<nsCString> flavors;
+  nsresult rv = aAsyncGetClipboardData.GetFlavorList(flavors);
+  if (NS_FAILED(rv)) {
+    return Err(rv);
+  }
+
+  auto requestParent = MakeNotNull<RefPtr<ClipboardReadRequestParent>>(
+      &aContentParent, &aAsyncGetClipboardData);
+
+  // Open a remote endpoint for our PClipboardReadRequest actor.
+  ManagedEndpoint<PClipboardReadRequestChild> childEndpoint =
+      aContentParent.OpenPClipboardReadRequestEndpoint(requestParent);
+  if (NS_WARN_IF(!childEndpoint.IsValid())) {
+    return Err(NS_ERROR_FAILURE);
+  }
+
+  return ClipboardReadRequest(std::move(childEndpoint), std::move(flavors));
+}
+
 class ClipboardGetCallback final : public nsIAsyncClipboardGetCallback {
  public:
   ClipboardGetCallback(ContentParent* aContentParent,
@@ -3553,20 +3575,16 @@ class ClipboardGetCallback final : public nsIAsyncClipboardGetCallback {
   // nsIAsyncClipboardGetCallback
   NS_IMETHOD OnSuccess(
       nsIAsyncGetClipboardData* aAsyncGetClipboardData) override {
-    nsTArray<nsCString> flavors;
-    nsresult rv = aAsyncGetClipboardData->GetFlavorList(flavors);
-    if (NS_FAILED(rv)) {
-      return OnError(rv);
-    }
+    MOZ_ASSERT(mContentParent);
+    MOZ_ASSERT(aAsyncGetClipboardData);
 
-    auto requestParent = MakeNotNull<RefPtr<ClipboardReadRequestParent>>(
-        mContentParent, aAsyncGetClipboardData);
-    if (!mContentParent->SendPClipboardReadRequestConstructor(
-            requestParent, std::move(flavors))) {
-      return OnError(NS_ERROR_FAILURE);
+    auto result =
+        CreateClipboardReadRequest(*mContentParent, *aAsyncGetClipboardData);
+    if (result.isErr()) {
+      return OnError(result.unwrapErr());
     }
 
-    mResolver(PClipboardReadRequestOrError(requestParent));
+    mResolver(result.unwrap());
     return NS_OK;
   }
 

diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
@@ -470,8 +470,13 @@ struct IPCImage {
     ImageIntSize size;
 };
 
-union PClipboardReadRequestOrError {
-    PClipboardReadRequest;
+struct ClipboardReadRequest {
+    ManagedEndpoint<PClipboardReadRequestChild> childEndpoint;
+    nsCString[] availableTypes;
+};
+
+union ClipboardReadRequestOrError {
+    ClipboardReadRequest;
     nsresult;
 };
 
@@ -1057,8 +1062,6 @@ child:
 
     async PRemotePrintJob();
 
-    async PClipboardReadRequest(nsCString[] aTypes);
-
 parent:
     async SynchronizeLayoutHistoryState(MaybeDiscardedBrowsingContext aContext,
                                         nullable nsILayoutHistoryState aState);
@@ -1233,7 +1236,7 @@ parent:
     async GetClipboardAsync(nsCString[] aTypes, int32_t aWhichClipboard,
                             MaybeDiscardedWindowContext aRequestingWindowContext,
                             nsIPrincipal aRequestingPrincipal)
-        returns (PClipboardReadRequestOrError aClipboardReadRequest);
+        returns (ClipboardReadRequestOrError aClipboardReadRequestOrError);
 
     // Clears the clipboard.
     async EmptyClipboard(int32_t aWhichClipboard);

diff --git a/widget/nsClipboardProxy.cpp b/widget/nsClipboardProxy.cpp
@@ -174,6 +174,28 @@ NS_IMETHODIMP AsyncGetClipboardDataProxy::GetData(
   return NS_OK;
 }
 
+static Result<RefPtr<AsyncGetClipboardDataProxy>, nsresult>
+CreateAsyncGetClipboardDataProxy(
+    ClipboardReadRequestOrError&& aClipboardReadRequestOrError) {
+  if (aClipboardReadRequestOrError.type() ==
+      ClipboardReadRequestOrError::Tnsresult) {
+    MOZ_ASSERT(NS_FAILED(aClipboardReadRequestOrError.get_nsresult()));
+    return Err(aClipboardReadRequestOrError.get_nsresult());
+  }
+
+  ClipboardReadRequest& request =
+      aClipboardReadRequestOrError.get_ClipboardReadRequest();
+  auto requestChild = MakeRefPtr<ClipboardReadRequestChild>(
+      std::move(request.availableTypes()));
+  if (NS_WARN_IF(
+          !ContentChild::GetSingleton()->BindPClipboardReadRequestEndpoint(
+              std::move(request.childEndpoint()), requestChild))) {
+    return Err(NS_ERROR_FAILURE);
+  }
+
+  return MakeRefPtr<AsyncGetClipboardDataProxy>(requestChild);
+}
+
 }  // namespace
 
 NS_IMETHODIMP nsClipboardProxy::AsyncGetData(
@@ -198,23 +220,16 @@ NS_IMETHODIMP nsClipboardProxy::AsyncGetData(
       ->Then(
           GetMainThreadSerialEventTarget(), __func__,
           /* resolve */
-          [callback = nsCOMPtr{aCallback}](const PClipboardReadRequestOrError&
-                                               aClipboardReadRequestOrError) {
-            if (aClipboardReadRequestOrError.type() ==
-                PClipboardReadRequestOrError::Tnsresult) {
-              MOZ_ASSERT(
-                  NS_FAILED(aClipboardReadRequestOrError.get_nsresult()));
-              callback->OnError(aClipboardReadRequestOrError.get_nsresult());
+          [callback = nsCOMPtr{aCallback}](
+              ClipboardReadRequestOrError&& aClipboardReadRequestOrError) {
+            auto result = CreateAsyncGetClipboardDataProxy(
+                std::move(aClipboardReadRequestOrError));
+            if (result.isErr()) {
+              callback->OnError(result.unwrapErr());
               return;
             }
 
-            auto asyncGetClipboardData = MakeRefPtr<AsyncGetClipboardDataProxy>(
-                static_cast<ClipboardReadRequestChild*>(
-                    aClipboardReadRequestOrError.get_PClipboardReadRequest()
-                        .AsChild()
-                        .get()));
-
-            callback->OnSuccess(asyncGetClipboardData);
+            callback->OnSuccess(result.inspect());
           },
           /* reject */
           [callback = nsCOMPtr{aCallback}](