From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 editor/composer/res/EditorOverride.css    |  4 ----
 editor/composer/test/test_bug1266815.html |  2 +-
 editor/composer/test/test_bug434998.xhtml | 14 ++++++--------
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'editor/composer')

diff --git a/editor/composer/res/EditorOverride.css b/editor/composer/res/EditorOverride.css
index a1733b76b1..c4c642705d 100644
--- a/editor/composer/res/EditorOverride.css
+++ b/editor/composer/res/EditorOverride.css
@@ -70,10 +70,6 @@ label {
     user-select: all !important;
 }
 
-::-moz-display-comboboxcontrol-frame {
-  user-select: text !important;
-}
-
 option {
   user-select: text !important;
 }
diff --git a/editor/composer/test/test_bug1266815.html b/editor/composer/test/test_bug1266815.html
index 1c565fb2c1..1c0a6d87e1 100644
--- a/editor/composer/test/test_bug1266815.html
+++ b/editor/composer/test/test_bug1266815.html
@@ -41,7 +41,7 @@ var helperAppDlgPromise = new Promise(function(resolve) {
   }
 
   HelperAppLauncherDialog.prototype = {
-    show(aLauncher, aWindowContext, aReason) {
+    show() {
       ok(true, "Whether showing Dialog");
       resolve();
       registrar.unregisterFactory(MOCK_HELPERAPP_DIALOG_CID,
diff --git a/editor/composer/test/test_bug434998.xhtml b/editor/composer/test/test_bug434998.xhtml
index db2261e3a5..0aad78f198 100644
--- a/editor/composer/test/test_bug434998.xhtml
+++ b/editor/composer/test/test_bug434998.xhtml
@@ -44,7 +44,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=434998
     QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
                                             "nsISupportsWeakReference"]),
 
-    onStateChange(aWebProgress, aRequest, aStateFlags, aStatus)
+    onStateChange(aWebProgress, aRequest, aStateFlags)
     {
       if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP)
       {
@@ -65,25 +65,23 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=434998
     },
 
 
-    onProgressChange(aWebProgress, aRequest,
-                                aCurSelfProgress, aMaxSelfProgress,
-                                aCurTotalProgress, aMaxTotalProgress)
+    onProgressChange()
     {
   },
 
-  onLocationChange(aWebProgress, aRequest, aLocation, aFlags)
+  onLocationChange()
     {
     },
 
-    onStatusChange(aWebProgress, aRequest, aStatus, aMessage)
+    onStatusChange()
     {
     },
 
-    onSecurityChange(aWebProgress, aRequest, aState)
+    onSecurityChange()
     {
     },
 
-    onContentBlockingEvent(aWebProgress, aRequest, aEvent)
+    onContentBlockingEvent()
     {
     },
 
-- 
cgit v1.2.3