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>
---
 mobile/android/components/geckoview/FilePickerDelegate.sys.mjs   | 4 ++--
 mobile/android/components/geckoview/GeckoViewPrompter.sys.mjs    | 2 +-
 mobile/android/components/geckoview/GeckoViewPush.sys.mjs        | 9 ++++-----
 mobile/android/components/geckoview/GeckoViewStartup.sys.mjs     | 4 ++--
 mobile/android/components/geckoview/LoginStorageDelegate.sys.mjs | 9 ++-------
 5 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'mobile/android/components/geckoview')

diff --git a/mobile/android/components/geckoview/FilePickerDelegate.sys.mjs b/mobile/android/components/geckoview/FilePickerDelegate.sys.mjs
index 3972017b40..52d1b93233 100644
--- a/mobile/android/components/geckoview/FilePickerDelegate.sys.mjs
+++ b/mobile/android/components/geckoview/FilePickerDelegate.sys.mjs
@@ -15,14 +15,14 @@ const { debug, warn } = GeckoViewUtils.initLogging("FilePickerDelegate");
 
 export class FilePickerDelegate {
   /* ----------  nsIFilePicker  ---------- */
-  init(aParent, aTitle, aMode) {
+  init(aBrowsingContext, aTitle, aMode) {
     if (
       aMode === Ci.nsIFilePicker.modeGetFolder ||
       aMode === Ci.nsIFilePicker.modeSave
     ) {
       throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
     }
-    this._prompt = new lazy.GeckoViewPrompter(aParent);
+    this._prompt = new lazy.GeckoViewPrompter(aBrowsingContext);
     this._msg = {
       type: "file",
       title: aTitle,
diff --git a/mobile/android/components/geckoview/GeckoViewPrompter.sys.mjs b/mobile/android/components/geckoview/GeckoViewPrompter.sys.mjs
index f81c155678..5c4b91c2de 100644
--- a/mobile/android/components/geckoview/GeckoViewPrompter.sys.mjs
+++ b/mobile/android/components/geckoview/GeckoViewPrompter.sys.mjs
@@ -140,7 +140,7 @@ export class GeckoViewPrompter {
 
       // Spin this thread while we wait for a result
       Services.tm.spinEventLoopUntil(
-        "GeckoViewPrompter.jsm:showPrompt",
+        "GeckoViewPrompter.sys.mjs:showPrompt",
         () => this._domWin.closed || result !== undefined
       );
     } finally {
diff --git a/mobile/android/components/geckoview/GeckoViewPush.sys.mjs b/mobile/android/components/geckoview/GeckoViewPush.sys.mjs
index d6625942e8..ee315b850f 100644
--- a/mobile/android/components/geckoview/GeckoViewPush.sys.mjs
+++ b/mobile/android/components/geckoview/GeckoViewPush.sys.mjs
@@ -22,7 +22,6 @@ const OBSERVER_TOPIC_SUBSCRIPTION_MODIFIED = "push-subscription-modified";
 
 function createSubscription({
   scope,
-  principal,
   browserPublicKey,
   authSecret,
   endpoint,
@@ -59,7 +58,7 @@ export class PushService {
 
   // nsIObserver methods
 
-  observe(subject, topic, data) {}
+  observe() {}
 
   // nsIPushService methods
 
@@ -151,13 +150,13 @@ export class PushService {
 
   // nsIPushQuotaManager methods
 
-  notificationForOriginShown(origin) {}
+  notificationForOriginShown() {}
 
-  notificationForOriginClosed(origin) {}
+  notificationForOriginClosed() {}
 
   // nsIPushErrorReporter methods
 
-  reportDeliveryError(messageId, reason) {}
+  reportDeliveryError() {}
 }
 
 PushService.prototype.classID = Components.ID(
diff --git a/mobile/android/components/geckoview/GeckoViewStartup.sys.mjs b/mobile/android/components/geckoview/GeckoViewStartup.sys.mjs
index 734db47887..2a5b0beb4d 100644
--- a/mobile/android/components/geckoview/GeckoViewStartup.sys.mjs
+++ b/mobile/android/components/geckoview/GeckoViewStartup.sys.mjs
@@ -95,7 +95,7 @@ const JSWINDOWACTORS = {
 
 export class GeckoViewStartup {
   /* ----------  nsIObserver  ---------- */
-  observe(aSubject, aTopic, aData) {
+  observe(aSubject, aTopic) {
     debug`observe: ${aTopic}`;
     switch (aTopic) {
       case "content-process-ready-for-script":
@@ -284,7 +284,7 @@ export class GeckoViewStartup {
     }
   }
 
-  onEvent(aEvent, aData, aCallback) {
+  onEvent(aEvent, aData) {
     debug`onEvent ${aEvent}`;
 
     switch (aEvent) {
diff --git a/mobile/android/components/geckoview/LoginStorageDelegate.sys.mjs b/mobile/android/components/geckoview/LoginStorageDelegate.sys.mjs
index 28916917ca..3c6d264069 100644
--- a/mobile/android/components/geckoview/LoginStorageDelegate.sys.mjs
+++ b/mobile/android/components/geckoview/LoginStorageDelegate.sys.mjs
@@ -38,12 +38,7 @@ export class LoginStorageDelegate {
     };
   }
 
-  promptToSavePassword(
-    aBrowser,
-    aLogin,
-    dismissed = false,
-    notifySaved = false
-  ) {
+  promptToSavePassword(aBrowser, aLogin, dismissed = false) {
     const prompt = new lazy.GeckoViewPrompter(aBrowser.ownerGlobal);
     prompt.asyncShowPrompt(
       this._createMessage({ dismissed }, [
@@ -75,7 +70,7 @@ export class LoginStorageDelegate {
     aOldLogin,
     aNewLogin,
     dismissed = false,
-    notifySaved = false,
+    notifySaved,
     autoSavedLoginGuid = ""
   ) {
     const newLogin = lazy.LoginEntry.fromLoginInfo(aOldLogin || aNewLogin);
-- 
cgit v1.2.3