From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:27 +0200 Subject: Adding upstream version 125.0.1. Signed-off-by: Daniel Baumann --- dom/ipc/tests/JSWindowActor/browser.toml | 5 ++++- dom/ipc/tests/JSWindowActor/browser_crash_report.js | 2 +- dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js | 4 ++-- dom/ipc/tests/JSWindowActor/browser_getActor_filter.js | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'dom/ipc/tests/JSWindowActor') diff --git a/dom/ipc/tests/JSWindowActor/browser.toml b/dom/ipc/tests/JSWindowActor/browser.toml index a9dc7e8b8f..5f406464f4 100644 --- a/dom/ipc/tests/JSWindowActor/browser.toml +++ b/dom/ipc/tests/JSWindowActor/browser.toml @@ -6,7 +6,10 @@ support-files = ["head.js"] ["browser_crash_report.js"] ["browser_destroy_callbacks.js"] -skip-if = ["!debug && os == 'mac'"] #Bug 1604538 +skip-if = [ + "apple_catalina && !debug", #Bug 1604538 + "apple_silicon && !debug", #Bug 1604538 +] ["browser_event_listener.js"] support-files = ["file_dummyChromePage.html"] diff --git a/dom/ipc/tests/JSWindowActor/browser_crash_report.js b/dom/ipc/tests/JSWindowActor/browser_crash_report.js index f029f1a85a..d2b2b3a694 100644 --- a/dom/ipc/tests/JSWindowActor/browser_crash_report.js +++ b/dom/ipc/tests/JSWindowActor/browser_crash_report.js @@ -5,7 +5,7 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ declTest("crash actor", { allFrames: true, - async test(browser) { + async test() { if (!("@mozilla.org/toolkit/crash-reporter;1" in Cc)) { ok(true, "Cannot test crash annotations without a crash reporter"); return; diff --git a/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js b/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js index 74cbae9415..e92de1b82f 100644 --- a/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js +++ b/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js @@ -142,7 +142,7 @@ declTest("destroy actor by page navigates", { declTest("destroy actor by tab being closed", { allFrames: true, - async test(browser) { + async test() { info("creating a new tab"); let newTab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL); let newTabBrowser = newTab.linkedBrowser; @@ -158,7 +158,7 @@ declTest("destroy actor by tab being closed", { let didDestroyPromise = new Promise(resolve => { Services.ppmm.addMessageListener( "test-jswindowactor-diddestroy", - function onmessage(msg) { + function onmessage() { Services.ppmm.removeMessageListener( "test-jswindowactor-diddestroy", onmessage diff --git a/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js b/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js index a10697c989..691cffe603 100644 --- a/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js +++ b/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js @@ -169,7 +169,7 @@ declTest("getActor with iframe messageManagerGroups match", { let parent = browser.browsingContext.currentWindowGlobal; ok(parent.getActor("TestWindow"), "JSWindowActorParent should have value."); - await SpecialPowers.spawn(browser, [TEST_URL], async function (url) { + await SpecialPowers.spawn(browser, [TEST_URL], async function () { let child = content.windowGlobalChild; ok(child, "WindowGlobalChild should have value."); ok(child.getActor("TestWindow"), "JSWindowActorChild should have value."); @@ -189,7 +189,7 @@ declTest("getActor with iframe messageManagerGroups mismatch", { "Should throw if its messageManagerGroups doesn't match." ); - await SpecialPowers.spawn(browser, [TEST_URL], async function (url) { + await SpecialPowers.spawn(browser, [TEST_URL], async function () { let child = content.windowGlobalChild; ok(child, "WindowGlobalChild should have value."); Assert.throws( -- cgit v1.2.3