diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:29 +0000 |
commit | 59203c63bb777a3bacec32fb8830fba33540e809 (patch) | |
tree | 58298e711c0ff0575818c30485b44a2f21bf28a0 /mobile/android/actors | |
parent | Adding upstream version 126.0.1. (diff) | |
download | firefox-59203c63bb777a3bacec32fb8830fba33540e809.tar.xz firefox-59203c63bb777a3bacec32fb8830fba33540e809.zip |
Adding upstream version 127.0.upstream/127.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mobile/android/actors')
-rw-r--r-- | mobile/android/actors/GeckoViewContentParent.sys.mjs | 4 | ||||
-rw-r--r-- | mobile/android/actors/GeckoViewSettingsChild.sys.mjs | 2 |
2 files changed, 4 insertions, 2 deletions
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(); } |