diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /netwerk/ipc | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'netwerk/ipc')
-rw-r--r-- | netwerk/ipc/DocumentLoadListener.cpp | 6 | ||||
-rw-r--r-- | netwerk/ipc/NeckoChannelParams.ipdlh | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/netwerk/ipc/DocumentLoadListener.cpp b/netwerk/ipc/DocumentLoadListener.cpp index d849eab750..32d7036ff1 100644 --- a/netwerk/ipc/DocumentLoadListener.cpp +++ b/netwerk/ipc/DocumentLoadListener.cpp @@ -1997,12 +1997,6 @@ bool DocumentLoadListener::MaybeTriggerProcessSwitch( return false; } - if (!StaticPrefs::fission_remoteObjectEmbed()) { - MOZ_LOG(gProcessIsolationLog, LogLevel::Verbose, - ("Process Switch Abort: remote <object>/<embed> disabled")); - return false; - } - mObjectUpgradeHandler->UpgradeObjectLoad()->Then( GetMainThreadSerialEventTarget(), __func__, [self = RefPtr{this}, options, parentWindow]( diff --git a/netwerk/ipc/NeckoChannelParams.ipdlh b/netwerk/ipc/NeckoChannelParams.ipdlh index c2948c7766..62b272e99c 100644 --- a/netwerk/ipc/NeckoChannelParams.ipdlh +++ b/netwerk/ipc/NeckoChannelParams.ipdlh @@ -63,6 +63,7 @@ struct CookieJarSettingsArgs nsString partitionKey; bool hasFingerprintingRandomizationKey; uint8_t[] fingerprintingRandomizationKey; + uint64_t topLevelWindowContextId; }; //----------------------------------------------------------------------------- |