Merging upstream version 126.0.

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

5 files changed, 7 insertions, 7 deletions

diff --git a/toolkit/components/alerts/nsIAlertsService.idl b/toolkit/components/alerts/nsIAlertsService.idl
index 2e75205ef5..412875a37b 100644
--- a/toolkit/components/alerts/nsIAlertsService.idl
+++ b/toolkit/components/alerts/nsIAlertsService.idl
@@ -312,14 +312,14 @@ interface nsIAlertsDoNotDisturb : nsISupports
    * code to show an alert. e.g. on OS X, the system will take care not
    * disrupting a user if we simply create a notification like usual.
    */
-  attribute bool manualDoNotDisturb;
+  attribute boolean manualDoNotDisturb;
 
   /**
    * Toggles a mode for the service to suppress all notifications from
    * being dispatched when sharing the screen via the getMediaDisplay
    * API.
    */
-  attribute bool suppressForScreenSharing;
+  attribute boolean suppressForScreenSharing;
 };
 
 [scriptable, uuid(fc6d7f0a-0cf6-4268-8c71-ab640842b9b1)]
diff --git a/toolkit/components/alerts/test/test_alerts_requireinteraction.html b/toolkit/components/alerts/test/test_alerts_requireinteraction.html
index ca8fa1c9e3..dc189920ad 100644
--- a/toolkit/components/alerts/test/test_alerts_requireinteraction.html
+++ b/toolkit/components/alerts/test/test_alerts_requireinteraction.html
@@ -23,7 +23,7 @@ const chromeScript = SpecialPowers.loadChromeScript(_ => {
       sendAsyncMessage("waitForXULAlert", false);
     }, 2000);
 
-    var windowObserver = function(win, aTopic, aData) {
+    var windowObserver = function(win, aTopic) {
       if (aTopic != "domwindowopened") {
         return;
       }
@@ -95,7 +95,7 @@ add_task(async function test_require_interaction() {
   var actualSequence = [];
 
   function createAlertListener(name, showCallback, finishCallback) {
-    return (subject, topic, data) => {
+    return (subject, topic) => {
       if (topic == "alertshow") {
         actualSequence.push(name + " show");
         if (showCallback) {
diff --git a/toolkit/components/alerts/test/test_invalid_utf16.html b/toolkit/components/alerts/test/test_invalid_utf16.html
index a4f862238c..5d7fa9c079 100644
--- a/toolkit/components/alerts/test/test_invalid_utf16.html
+++ b/toolkit/components/alerts/test/test_invalid_utf16.html
@@ -18,7 +18,7 @@
       let promise = new Promise((res, rej) => {resolve = res; reject = rej});
 
       let success = false;
-      function observe(aSubject, aTopic, aData) {
+      function observe(aSubject, aTopic) {
         if (aTopic == "alertshow") {
           success = true;
           notifier.closeAlert(alertName);
diff --git a/toolkit/components/alerts/test/test_multiple_alerts.html b/toolkit/components/alerts/test/test_multiple_alerts.html
index 95843b2e89..830dfdc1bb 100644
--- a/toolkit/components/alerts/test/test_multiple_alerts.html
+++ b/toolkit/components/alerts/test/test_multiple_alerts.html
@@ -26,7 +26,7 @@ const chromeScript = SpecialPowers.loadChromeScript(_ => {
       sendAsyncMessage("waitedForPosition", null);
     }, 2000);
 
-    var windowObserver = function(win, aTopic, aData) {
+    var windowObserver = function(win, aTopic) {
       if (aTopic != "domwindowopened") {
         return;
       }
diff --git a/toolkit/components/alerts/test/test_principal.html b/toolkit/components/alerts/test/test_principal.html
index 5464d92977..7b0795d3f8 100644
--- a/toolkit/components/alerts/test/test_principal.html
+++ b/toolkit/components/alerts/test/test_principal.html
@@ -38,7 +38,7 @@ const chromeScript = SpecialPowers.loadChromeScript(_ => {
 function notify(alertName, principal) {
   return new Promise((resolve, reject) => {
     var source;
-    async function observe(subject, topic, data) {
+    async function observe(subject, topic) {
       if (topic == "alertclickcallback") {
         reject(new Error("Alerts should not be clicked during test"));
       } else if (topic == "alertshow") {