From 59203c63bb777a3bacec32fb8830fba33540e809 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:29 +0200 Subject: Adding upstream version 127.0. Signed-off-by: Daniel Baumann --- mobile/android/actors/GeckoViewContentParent.sys.mjs | 4 +++- mobile/android/actors/GeckoViewSettingsChild.sys.mjs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'mobile/android/actors') diff --git a/mobile/android/actors/GeckoViewContentParent.sys.mjs b/mobile/android/actors/GeckoViewContentParent.sys.mjs index e666040b5e..082c68b3c0 100644 --- a/mobile/android/actors/GeckoViewContentParent.sys.mjs +++ b/mobile/android/actors/GeckoViewContentParent.sys.mjs @@ -9,6 +9,8 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { SessionHistory: "resource://gre/modules/sessionstore/SessionHistory.sys.mjs", + SessionStoreHelper: + "resource://gre/modules/sessionstore/SessionStoreHelper.sys.mjs", }); const { debug, warn } = GeckoViewUtils.initLogging("GeckoViewContentParent"); @@ -33,7 +35,7 @@ export class GeckoViewContentParent extends GeckoViewActorParent { // TODO Bug 1648158 this should include scroll, form history, etc return SessionStoreUtils.initializeRestore( browsingContext, - SessionStoreUtils.constructSessionStoreRestoreData() + lazy.SessionStoreHelper.buildRestoreData(formdata, scrolldata) ); } diff --git a/mobile/android/actors/GeckoViewSettingsChild.sys.mjs b/mobile/android/actors/GeckoViewSettingsChild.sys.mjs index d5e6c01e27..625905caab 100644 --- a/mobile/android/actors/GeckoViewSettingsChild.sys.mjs +++ b/mobile/android/actors/GeckoViewSettingsChild.sys.mjs @@ -14,7 +14,7 @@ export class GeckoViewSettingsChild extends GeckoViewActorChild { case "SettingsUpdate": { const settings = message.data; - if (settings.isPopup) { + if (settings.isExtensionPopup) { // Allow web extensions to close their own action popups (bz1612363) this.contentWindow.windowUtils.allowScriptsToClose(); } -- cgit v1.2.3