Bug 1869582 - Dismiss clipboard permission UI when user tap on the browser; r=geckoview-reviewers,calu

Differential Revision: https://phabricator.services.mozilla.com/D196893

Author: EdgarChen

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt

@@ -514,6 +514,52 @@ class SelectionActionDelegateTest : BaseSessionTest() {
         sessionRule.waitForPageStop()
     }
 
+    @WithDisplay(width = 100, height = 100)
+    @Test
+    fun clipboardReadDismiss() {
+        assumeThat("Unnecessary to run multiple times", id, equalTo("#text"))
+
+        sessionRule.setPrefsUntilTestEnd(mapOf("dom.events.asyncClipboard.readText" to true))
+
+        withClipboard("clipboardReadDismiss") {} // Reset clipboard data
+
+        val url = createTestUrl(CLIPBOARD_READ_HTML_PATH)
+        mainSession.loadUri(url)
+        mainSession.waitForPageStop()
+
+        val result = GeckoResult<Void>()
+        val permissionResult = GeckoResult<AllowOrDeny>()
+        mainSession.delegateDuringNextWait(object : SelectionActionDelegate {
+            @AssertCalled(count = 1)
+            override fun onShowClipboardPermissionRequest(
+                session: GeckoSession,
+                perm: ClipboardPermission,
+            ):
+                GeckoResult<AllowOrDeny>? {
+                assertThat(
+                    "Type should match",
+                    perm.type,
+                    equalTo(SelectionActionDelegate.PERMISSION_CLIPBOARD_READ),
+                )
+                result.complete(null)
+                return permissionResult
+            }
+        })
+
+        mainSession.synthesizeTap(50, 50) // Provides user activation.
+        sessionRule.waitForResult(result)
+
+        mainSession.delegateDuringNextWait(object : SelectionActionDelegate {
+            @AssertCalled
+            override fun onDismissClipboardPermissionRequest(session: GeckoSession) {
+                permissionResult.complete(AllowOrDeny.DENY)
+            }
+        })
+
+        mainSession.synthesizeTap(10, 10) // click to dismiss.
+        sessionRule.waitForResult(permissionResult)
+    }
+
     /** Interface that defines behavior for a particular type of content */
     private interface SelectedContent {
         fun focus() {}

mobile/android/modules/geckoview/GeckoViewClipboardPermission.sys.mjs

@@ -60,6 +60,7 @@ export var GeckoViewClipboardPermission = {
 
       debug`confirmUserPaste (${screenRect.x}, ${screenRect.y})`;
 
+      document.addEventListener("pointerdown", this);
       document.ownerGlobal.WindowEventDispatcher.sendRequestForResult({
         type: "GeckoView:ClipboardPermissionRequest",
         screenPoint: {
@@ -71,13 +72,28 @@ export var GeckoViewClipboardPermission = {
           const propBag = lazy.PromptUtils.objectToPropBag({ ok: allowOrDeny });
           this._pendingRequest.resolve(propBag);
           this._pendingRequest = null;
+          document.removeEventListener("pointerdown", this);
         },
         error => {
           debug`Permission error: ${error}`;
           this._pendingRequest.reject();
           this._pendingRequest = null;
+          document.removeEventListener("pointerdown", this);
         }
       );
     });
   },
+
+  // EventListener interface.
+  handleEvent(aEvent) {
+    debug`handleEvent: ${aEvent.type}`;
+    switch (aEvent.type) {
+      case "pointerdown": {
+        aEvent.target.ownerGlobal.WindowEventDispatcher.sendRequestForResult({
+          type: "GeckoView:DismissClipboardPermissionRequest",
+        });
+        break;
+      }
+    }
+  },
 };