From e677e7ba4e7c572ad0800a0ee4b6308ff1f58180 Mon Sep 17 00:00:00 2001
From: Joel Einbinder <joel.einbinder@gmail.com>
Date: Tue, 23 Feb 2021 15:21:29 -0800
Subject: [PATCH] browser(firefox): pass drag action test (#5560)

---
 browser_patches/firefox/BUILD_NUMBER                 | 4 ++--
 browser_patches/firefox/juggler/content/PageAgent.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER
index a797701506..7bc62596a5 100644
--- a/browser_patches/firefox/BUILD_NUMBER
+++ b/browser_patches/firefox/BUILD_NUMBER
@@ -1,2 +1,2 @@
-1234
-Changed: lushnikov@chromium.org Fri 19 Feb 2021 21:20:12 PM PST
+1235
+Changed: joel.einbinder@gmail.com Mon 22 Feb 2021 09:28:46 PM PST
diff --git a/browser_patches/firefox/juggler/content/PageAgent.js b/browser_patches/firefox/juggler/content/PageAgent.js
index 4501d426bb..14345d9711 100644
--- a/browser_patches/firefox/juggler/content/PageAgent.js
+++ b/browser_patches/firefox/juggler/content/PageAgent.js
@@ -819,10 +819,10 @@ class PageAgent {
       null /* relatedTarget */,
       dragService.getCurrentSession().dataTransfer.mozCloneForEvent(type)
     );
-
-    window.windowUtils.dispatchDOMEventViaPresShellForTesting(element, event);
+    if (type !== 'drop' || dragService.dragAction)
+      window.windowUtils.dispatchDOMEventViaPresShellForTesting(element, event);
     if (type === 'drop')
-      dragService.endDragSession(true);
+      this._cancelDragIfNeeded();
   }
 
   _cancelDragIfNeeded() {