Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 10 insertions, 10 deletions

diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.cpp b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
index 209af157a3..b482214d31 100644
--- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp
+++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
@@ -1431,7 +1431,7 @@ nsresult nsWindowWatcher::OpenWindowInternal(
     }
     if (parentWidget &&
         ((!newWindowShouldBeModal && parentIsModal) || isAppModal)) {
-      parentWidget->SetFakeModal(true);
+      parentWidget->SetModal(true);
     } else {
       // Reset popup state while opening a modal dialog, and firing
       // events about the dialog, to prevent the current state from
diff --git a/toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js b/toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
index 4eff3b46f0..d14175c088 100644
--- a/toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
+++ b/toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
@@ -134,7 +134,7 @@ function getContentChromeFlags(win) {
  * @param chromeFlags (int)
  *        Some chromeFlags to check.
  */
-function assertContentFlags(chromeFlags, isPopup) {
+function assertContentFlags(chromeFlags) {
   for (let feature in DISALLOWED) {
     let flag = DISALLOWED[feature].flag;
     Assert.ok(flag, "Expected flag to be a non-zeroish value");
@@ -183,7 +183,7 @@ add_task(async function test_disallowed_flags() {
       gBrowser,
       url: SCRIPT_PAGE,
     },
-    async function (browser) {
+    async function () {
       let win = await newWinPromise;
       let parentChromeFlags = getParentChromeFlags(win);
       assertContentFlags(parentChromeFlags);
@@ -230,7 +230,7 @@ add_task(async function test_disallowed_flags() {
       gBrowser,
       url: SCRIPT_PAGE_FOR_CHROME_ALL,
     },
-    async function (browser) {
+    async function () {
       let win = await newWinPromise;
       let parentChromeFlags = getParentChromeFlags(win);
       Assert.notEqual(
@@ -257,7 +257,7 @@ add_task(async function test_scrollbars_flag() {
       gBrowser,
       url: SCRIPT_PAGE,
     },
-    async function (browser) {
+    async function () {
       let win = await newWinPromise;
 
       let parentChromeFlags = getParentChromeFlags(win);
diff --git a/toolkit/components/windowwatcher/test/browser_new_remote_window_flags.js b/toolkit/components/windowwatcher/test/browser_new_remote_window_flags.js
index 06a15d123c..ae2bdc41b3 100644
--- a/toolkit/components/windowwatcher/test/browser_new_remote_window_flags.js
+++ b/toolkit/components/windowwatcher/test/browser_new_remote_window_flags.js
@@ -61,7 +61,7 @@ add_task(async function test_new_remote_window_flags_window_open() {
       gBrowser,
       url: SCRIPT_PAGE,
     },
-    async function (browser) {
+    async function () {
       let win = await newWinPromise;
       assertFlags(win);
       await BrowserTestUtils.closeWindow(win);
diff --git a/toolkit/components/windowwatcher/test/browser_new_sized_window.js b/toolkit/components/windowwatcher/test/browser_new_sized_window.js
index 0a1e63a8c8..acb73f027e 100644
--- a/toolkit/components/windowwatcher/test/browser_new_sized_window.js
+++ b/toolkit/components/windowwatcher/test/browser_new_sized_window.js
@@ -33,7 +33,7 @@ function test_dimensions({ width, height }) {
       gBrowser,
       url: SCRIPT_PAGE,
     },
-    async function (browser) {
+    async function () {
       let win = await newWinPromise;
       let rect = win.gBrowser.selectedBrowser.getBoundingClientRect();
 
diff --git a/toolkit/components/windowwatcher/test/browser_non_popup_from_popup.js b/toolkit/components/windowwatcher/test/browser_non_popup_from_popup.js
index 9c905bacc1..b6e7f2b131 100644
--- a/toolkit/components/windowwatcher/test/browser_non_popup_from_popup.js
+++ b/toolkit/components/windowwatcher/test/browser_non_popup_from_popup.js
@@ -28,7 +28,7 @@ add_task(async function test_non_popup_from_popup() {
       gBrowser,
       url: BLANK_PAGE,
     },
-    async function (browser) {
+    async function () {
       // Wait for a popup opened by POPUP_OPENER.
       const newPopupPromise = BrowserTestUtils.waitForNewWindow();
 
diff --git a/toolkit/components/windowwatcher/test/head.js b/toolkit/components/windowwatcher/test/head.js
index f72344bcd0..d126856244 100644
--- a/toolkit/components/windowwatcher/test/head.js
+++ b/toolkit/components/windowwatcher/test/head.js
@@ -125,7 +125,7 @@ async function testPopupPatterns(nonPopup) {
           gBrowser,
           url: BLANK_PAGE,
         },
-        async function (browser) {
+        async function () {
           const newWinPromise = BrowserTestUtils.waitForNewWindow();
           BrowserTestUtils.startLoadingURIString(gBrowser, SCRIPT_PAGE);
 
@@ -159,7 +159,7 @@ async function testPopupPatterns(nonPopup) {
           gBrowser,
           url: BLANK_PAGE,
         },
-        async function (browser) {
+        async function () {
           const newTabPromise = BrowserTestUtils.waitForNewTab(
             gBrowser,
             OPEN_PAGE