Adding upstream version 125.0.1.upstream/125.0.1

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

3 files changed, 13 insertions, 14 deletions

diff --git a/mobile/android/chrome/geckoview/SessionStateAggregator.js b/mobile/android/chrome/geckoview/SessionStateAggregator.js
index ede17328ac..e41c31ba06 100644
--- a/mobile/android/chrome/geckoview/SessionStateAggregator.js
+++ b/mobile/android/chrome/geckoview/SessionStateAggregator.js
@@ -29,7 +29,6 @@ const DEFAULT_INTERVAL_MS = 1500;
 const TIMEOUT_DISABLED_PREF = "browser.sessionstore.debug.no_auto_updates";
 
 const PREF_INTERVAL = "browser.sessionstore.interval";
-const PREF_SESSION_COLLECTION = "browser.sessionstore.platform_collection";
 
 class Handler {
   constructor(store) {
@@ -96,7 +95,7 @@ class StateChangeNotifier extends Handler {
   /**
    * @see nsIWebProgressListener.onStateChange
    */
-  onStateChange(webProgress, request, stateFlags, status) {
+  onStateChange(webProgress, request, stateFlags) {
     // Ignore state changes for subframes because we're only interested in the
     // top-document starting or stopping its load.
     if (!webProgress.isTopLevel || webProgress.DOMWindow != this.mm.content) {
@@ -206,7 +205,7 @@ class SessionHistoryListener extends Handler {
     });
   }
 
-  handleEvent(event) {
+  handleEvent() {
     this.collect();
   }
 
@@ -218,30 +217,30 @@ class SessionHistoryListener extends Handler {
     this.collect();
   }
 
-  OnHistoryNewEntry(newURI, oldIndex) {
+  OnHistoryNewEntry() {
     // We ought to collect the previously current entry as well, see bug 1350567.
     // TODO: Reenable partial history collection for performance
     // this.collectFrom(oldIndex);
     this.collect();
   }
 
-  OnHistoryGotoIndex(index, gotoURI) {
+  OnHistoryGotoIndex() {
     // We ought to collect the previously current entry as well, see bug 1350567.
     // TODO: Reenable partial history collection for performance
     // this.collectFrom(LAST_INDEX);
     this.collect();
   }
 
-  OnHistoryPurge(numEntries) {
+  OnHistoryPurge() {
     this.collect();
   }
 
-  OnHistoryReload(reloadURI, reloadFlags) {
+  OnHistoryReload() {
     this.collect();
     return true;
   }
 
-  OnHistoryReplaceEntry(index) {
+  OnHistoryReplaceEntry() {
     this.collect();
   }
 }
@@ -607,7 +606,7 @@ class SessionStateAggregator extends GeckoViewChildModule {
       this.messageQueue,
     ];
 
-    if (!Services.prefs.getBoolPref(PREF_SESSION_COLLECTION, false)) {
+    if (!Services.appinfo.sessionStorePlatformCollection) {
       this.handlers.push(
         new FormDataListener(this),
         new ScrollPositionListener(this)
diff --git a/mobile/android/chrome/geckoview/config.js b/mobile/android/chrome/geckoview/config.js
index 1cf92416ac..9b1226a330 100644
--- a/mobile/android/chrome/geckoview/config.js
+++ b/mobile/android/chrome/geckoview/config.js
@@ -147,7 +147,7 @@ var NewPrefDialog = {
 
   // New prefs create dialog only allows creating a non-existing preference, doesn't allow for
   // Changing an existing one on-the-fly, tap existing/displayed line item pref for that
-  create: function AC_create(aEvent) {
+  create: function AC_create() {
     if (this._positiveButton.getAttribute("disabled") == "true") {
       return;
     }
@@ -342,7 +342,7 @@ var AboutConfig = {
   },
 
   // If scrolling at the bottom, maybe add some more entries
-  onScroll: function AC_onScroll(aEvent) {
+  onScroll: function AC_onScroll() {
     if (
       this._prefsContainer.scrollHeight -
         (window.pageYOffset + window.innerHeight) <
diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js
index 6dc5ed4610..dc7ceab7f8 100644
--- a/mobile/android/chrome/geckoview/geckoview.js
+++ b/mobile/android/chrome/geckoview/geckoview.js
@@ -255,7 +255,7 @@ var ModuleManager = {
     this._moduleByActorName[aActorName].receiveMessage(aMessage);
   },
 
-  onEvent(aEvent, aData, aCallback) {
+  onEvent(aEvent, aData) {
     debug`onEvent ${aEvent} ${aData}`;
     switch (aEvent) {
       case "GeckoView:UpdateModuleState": {
@@ -865,11 +865,11 @@ function startup() {
       ModuleManager.afterBrowserRemotenessChange(switchId);
   }
 
-  browser.addEventListener("WillChangeBrowserRemoteness", event =>
+  browser.addEventListener("WillChangeBrowserRemoteness", () =>
     ModuleManager.willChangeBrowserRemoteness()
   );
 
-  browser.addEventListener("DidChangeBrowserRemoteness", event =>
+  browser.addEventListener("DidChangeBrowserRemoteness", () =>
     ModuleManager.didChangeBrowserRemoteness()
   );