Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 3 insertions, 6 deletions

diff --git a/widget/windows/filedialog/WinFileDialogChild.cpp b/widget/windows/filedialog/WinFileDialogChild.cpp
index 1a2903f8ec..a41018ff0e 100644
--- a/widget/windows/filedialog/WinFileDialogChild.cpp
+++ b/widget/windows/filedialog/WinFileDialogChild.cpp
@@ -40,11 +40,8 @@ WinFileDialogChild::~WinFileDialogChild() {
 template <size_t N>
 WinFileDialogChild::IPCResult WinFileDialogChild::MakeIpcFailure(
     HRESULT hr, const char (&what)[N]) {
-  // The crash-report annotator stringifies integer values anyway. We do so
-  // eagerly here to avoid questions about C int/long conversion semantics.
-  nsPrintfCString data("%lu", hr);
-  CrashReporter::AnnotateCrashReport(
-      CrashReporter::Annotation::WindowsFileDialogErrorCode, data);
+  CrashReporter::RecordAnnotationU32(
+      CrashReporter::Annotation::WindowsFileDialogErrorCode, hr);
 
   return IPC_FAIL(this, what);
 }
diff --git a/widget/windows/filedialog/WinFileDialogCommands.cpp b/widget/windows/filedialog/WinFileDialogCommands.cpp
index f0503ab8f0..838856893d 100644
--- a/widget/windows/filedialog/WinFileDialogCommands.cpp
+++ b/widget/windows/filedialog/WinFileDialogCommands.cpp
@@ -294,7 +294,7 @@ void LogProcessingError(LogModule* aModule, ipc::IProtocol* aCaller,
           ipc::SandboxingKind::WINDOWS_FILE_DIALOG);
     } else {
       // ... which (presumably) is us
-      CrashReporter::AnnotateCrashReport(
+      CrashReporter::AutoRecordAnnotation(
           CrashReporter::Annotation::ipc_channel_error, reason);
 
       MOZ_CRASH("IPC error");