diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:22:11 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:22:11 +0000 |
| commit | 724b36b7051c0d9190cbd8854ba5919904967c11 (patch) | |
| tree | 8996ac57bf70972bf524e865e0845cd54aab6f6b /browser/base | |
| parent | Releasing progress-linux version 115.10.0esr-1~deb12u1progress7u1. (diff) | |
| download | firefox-esr-724b36b7051c0d9190cbd8854ba5919904967c11.tar.xz firefox-esr-724b36b7051c0d9190cbd8854ba5919904967c11.zip | |
Merging upstream version 115.11.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/base')
| -rw-r--r-- | browser/base/content/tabbrowser.js | 12 | ||||
| -rw-r--r-- | browser/base/content/test/performance/browser_startup_content.js | 7 |
2 files changed, 0 insertions, 19 deletions
diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js index f56e1f0a01..678e923d5c 100644 --- a/browser/base/content/tabbrowser.js +++ b/browser/base/content/tabbrowser.js @@ -2128,18 +2128,6 @@ // doesn't keep the window alive. b.permanentKey = new (Cu.getGlobalForObject(Services).Object)(); - // Ensure that SessionStore has flushed any session history state from the - // content process before we this browser's remoteness. - if (!Services.appinfo.sessionHistoryInParent) { - b.prepareToChangeRemoteness = () => - SessionStore.prepareToChangeRemoteness(b); - b.afterChangeRemoteness = switchId => { - let tab = this.getTabForBrowser(b); - SessionStore.finishTabRemotenessChange(tab, switchId); - return true; - }; - } - const defaultBrowserAttributes = { contextmenu: "contentAreaContextMenu", message: "true", diff --git a/browser/base/content/test/performance/browser_startup_content.js b/browser/base/content/test/performance/browser_startup_content.js index 330f9b7655..fa7bef7ae9 100644 --- a/browser/base/content/test/performance/browser_startup_content.js +++ b/browser/base/content/test/performance/browser_startup_content.js @@ -55,12 +55,6 @@ const known_scripts = { ]), }; -if (!Services.appinfo.sessionHistoryInParent) { - known_scripts.modules.add( - "resource:///modules/sessionstore/ContentSessionStore.sys.mjs" - ); -} - if (AppConstants.NIGHTLY_BUILD) { // Browser front-end. known_scripts.modules.add("resource:///actors/InteractionsChild.sys.mjs"); @@ -71,7 +65,6 @@ if (AppConstants.NIGHTLY_BUILD) { const intermittently_loaded_scripts = { modules: new Set([ "resource://gre/modules/nsAsyncShutdown.sys.mjs", - "resource://gre/modules/sessionstore/Utils.sys.mjs", // Translations code which may be preffed on. "resource://gre/actors/TranslationsChild.sys.mjs", |