diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
| commit | 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch) | |
| tree | a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /toolkit/xre/nsEmbedFunctions.cpp | |
| parent | Adding debian version 124.0.1-1. (diff) | |
| download | firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/xre/nsEmbedFunctions.cpp')
| -rw-r--r-- | toolkit/xre/nsEmbedFunctions.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp index 72077d6ddf..3718d8db4c 100644 --- a/toolkit/xre/nsEmbedFunctions.cpp +++ b/toolkit/xre/nsEmbedFunctions.cpp @@ -207,13 +207,13 @@ void SetTaskbarGroupId(const nsString& aId) { #if defined(MOZ_SANDBOX) void AddContentSandboxLevelAnnotation() { if (XRE_GetProcessType() == GeckoProcessType_Content) { - int level = GetEffectiveContentSandboxLevel(); - CrashReporter::AnnotateCrashReport( - CrashReporter::Annotation::ContentSandboxLevel, level); + uint32_t contentSandboxLevel = GetEffectiveContentSandboxLevel(); + CrashReporter::RecordAnnotationU32( + CrashReporter::Annotation::ContentSandboxLevel, contentSandboxLevel); } else if (XRE_GetProcessType() == GeckoProcessType_GPU) { - int level = GetEffectiveGpuSandboxLevel(); - CrashReporter::AnnotateCrashReport( - CrashReporter::Annotation::GpuSandboxLevel, level); + uint32_t gpuSandboxLevel = GetEffectiveGpuSandboxLevel(); + CrashReporter::RecordAnnotationU32( + CrashReporter::Annotation::GpuSandboxLevel, gpuSandboxLevel); } } #endif /* MOZ_SANDBOX */ @@ -525,7 +525,7 @@ nsresult XRE_InitChildProcess(int aArgc, char* aArgv[], #if defined(XP_WIN) # if defined(MOZ_SANDBOX) if (aChildData->sandboxBrokerServices) { - SandboxBroker::Initialize(aChildData->sandboxBrokerServices); + SandboxBroker::Initialize(aChildData->sandboxBrokerServices, u""_ns); SandboxBroker::GeckoDependentInitialize(); } # endif // defined(MOZ_SANDBOX) |