diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
tree | 532507288f3defd7f4dcf1af49698bcb76034855 /dom/ipc/WindowGlobalParent.cpp | |
parent | Adding debian version 126.0.1-1. (diff) | |
download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/ipc/WindowGlobalParent.cpp')
-rw-r--r-- | dom/ipc/WindowGlobalParent.cpp | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/dom/ipc/WindowGlobalParent.cpp b/dom/ipc/WindowGlobalParent.cpp index f60790a155..4379c7280c 100644 --- a/dom/ipc/WindowGlobalParent.cpp +++ b/dom/ipc/WindowGlobalParent.cpp @@ -10,6 +10,7 @@ #include "mozilla/AntiTrackingUtils.h" #include "mozilla/AsyncEventDispatcher.h" +#include "mozilla/BounceTrackingStorageObserver.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/ContentBlockingAllowList.h" #include "mozilla/dom/InProcessParent.h" @@ -75,7 +76,7 @@ #include "mozilla/net/PCookieServiceParent.h" #include "mozilla/net/CookieServiceParent.h" -#include "SessionStoreFunctions.h" +#include "nsISessionStoreFunctions.h" #include "nsIXPConnect.h" #include "nsImportModule.h" #include "nsIXULRuntime.h" @@ -1705,8 +1706,29 @@ IPCResult WindowGlobalParent::RecvSetCookies( aCookies, GetBrowsingContext()); } -NS_IMPL_CYCLE_COLLECTION_INHERITED(WindowGlobalParent, WindowContext, - mPageUseCountersWindow) +IPCResult WindowGlobalParent::RecvOnInitialStorageAccess() { + DebugOnly<nsresult> rv = + BounceTrackingStorageObserver::OnInitialStorageAccess(this); + NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Failed to notify storage access"); + return IPC_OK(); +} + +NS_IMPL_CYCLE_COLLECTION_CLASS(WindowGlobalParent) + +NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(WindowGlobalParent, + WindowContext) + NS_IMPL_CYCLE_COLLECTION_UNLINK(mPageUseCountersWindow) + tmp->UnlinkManager(); +NS_IMPL_CYCLE_COLLECTION_UNLINK_END + +NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(WindowGlobalParent, + WindowContext) + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPageUseCountersWindow) + if (!tmp->IsInProcess()) { + CycleCollectionNoteChild(cb, static_cast<BrowserParent*>(tmp->Manager()), + "Manager()"); + } +NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(WindowGlobalParent, WindowContext) |