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

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 layout/forms/test/test_bug536567_perwindowpb.html |  2 +-
 layout/forms/test/test_bug935876.html             | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'layout/forms/test')

diff --git a/layout/forms/test/test_bug536567_perwindowpb.html b/layout/forms/test/test_bug536567_perwindowpb.html
index 224b2c74a4..e27803157e 100644
--- a/layout/forms/test/test_bug536567_perwindowpb.html
+++ b/layout/forms/test/test_bug536567_perwindowpb.html
@@ -19,7 +19,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=536567
 const Cm = Components.manager;
 
 var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.init(window);
+MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 
 var tmpDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
 var homeDir = Services.dirsvc.get("Desk", Ci.nsIFile);
diff --git a/layout/forms/test/test_bug935876.html b/layout/forms/test/test_bug935876.html
index 4488fdf962..465fcac732 100644
--- a/layout/forms/test/test_bug935876.html
+++ b/layout/forms/test/test_bug935876.html
@@ -112,7 +112,7 @@ function runTests()
   var listbox = document.getElementById("listbox");
   listbox.addEventListener("keydown", onKeydown);
   listbox.addEventListener("keypress", onKeypress);
-  SpecialPowers.addSystemEventListener(listbox, "keydown", onkeydownInSystemEventGroup, false);
+  SpecialPowers.wrap(listbox).addEventListener("keydown", onkeydownInSystemEventGroup, { mozSystemGroup: true });
 
   listbox.focus();
 
@@ -185,14 +185,13 @@ function runTests()
 
   listbox.removeEventListener("keydown", onKeydown);
   listbox.removeEventListener("keypress", onKeypress);
-  SpecialPowers.removeSystemEventListener(listbox, "keydown", onkeydownInSystemEventGroup, false);
-
+  SpecialPowers.wrap(listbox).removeEventListener("keydown", onkeydownInSystemEventGroup, { mozSystemGroup: true });
 
 
   var multipleListbox = document.getElementById("multipleListbox");
   multipleListbox.addEventListener("keydown", onKeydown);
   multipleListbox.addEventListener("keypress", onKeypress);
-  SpecialPowers.addSystemEventListener(multipleListbox, "keydown", onkeydownInSystemEventGroup, false);
+  SpecialPowers.wrap(multipleListbox).addEventListener("keydown", onkeydownInSystemEventGroup, { mozSystemGroup: true });
 
   multipleListbox.focus();
 
@@ -265,14 +264,13 @@ function runTests()
 
   multipleListbox.removeEventListener("keydown", onKeydown);
   multipleListbox.removeEventListener("keypress", onKeypress);
-  SpecialPowers.removeSystemEventListener(multipleListbox, "keydown", onkeydownInSystemEventGroup, false);
-
+  SpecialPowers.wrap(multipleListbox).removeEventListener("keydown", onkeydownInSystemEventGroup, { mozSystemGroup: true });
 
 
   var combobox = document.getElementById("combobox");
   combobox.addEventListener("keydown", onKeydown);
   combobox.addEventListener("keypress", onKeypress);
-  SpecialPowers.addSystemEventListener(combobox, "keydown", onkeydownInSystemEventGroup, false);
+  SpecialPowers.wrap(combobox).addEventListener("keydown", onkeydownInSystemEventGroup, { mozSystemGroup: true });
 
   combobox.focus();
 
@@ -353,7 +351,7 @@ function runTests()
   {
     combobox.removeEventListener("keydown", onKeydown);
     combobox.removeEventListener("keypress", onKeypress);
-    SpecialPowers.removeSystemEventListener(combobox, "keydown", onkeydownInSystemEventGroup, false);
+    SpecialPowers.wrap(combobox).removeEventListener("keydown", onkeydownInSystemEventGroup, { mozSystemGroup: true });
     SimpleTest.finish();
   }
 
-- 
cgit v1.2.3