Merging upstream version 125.0.1.

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

7 files changed, 38 insertions, 39 deletions

diff --git a/dom/media/gmp/ChromiumCDMProxy.cpp b/dom/media/gmp/ChromiumCDMProxy.cpp
index e8d871a113..566b386b0b 100644
--- a/dom/media/gmp/ChromiumCDMProxy.cpp
+++ b/dom/media/gmp/ChromiumCDMProxy.cpp
@@ -605,8 +605,7 @@ void ChromiumCDMProxy::GetStatusForPolicy(
   MOZ_ASSERT(NS_IsMainThread());
   EME_LOG("ChromiumCDMProxy::GetStatusForPolicy(this=%p, pid=%" PRIu32
           ") minHdcpVersion=%s",
-          this, aPromiseId,
-          dom::HDCPVersionValues::GetString(aMinHdcpVersion).data());
+          this, aPromiseId, dom::GetEnumString(aMinHdcpVersion).get());
 
   RefPtr<gmp::ChromiumCDMParent> cdm = GetCDMParent();
   if (!cdm) {
diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
index 1eea8b108b..d543d46387 100644
--- a/dom/media/gmp/GMPChild.cpp
+++ b/dom/media/gmp/GMPChild.cpp
@@ -237,16 +237,15 @@ mozilla::ipc::IPCResult GMPChild::RecvPreloadLibs(const nsCString& aLibs) {
 bool GMPChild::GetUTF8LibPath(nsACString& aOutLibPath) {
   nsCOMPtr<nsIFile> libFile;
 
-#define GMP_PATH_CRASH(explain)                          \
-  do {                                                   \
-    nsAutoString path;                                   \
-    if (!libFile || NS_FAILED(libFile->GetPath(path))) { \
-      path = mPluginPath;                                \
-    }                                                    \
-    CrashReporter::AnnotateCrashReport(                  \
-        CrashReporter::Annotation::GMPLibraryPath,       \
-        NS_ConvertUTF16toUTF8(path));                    \
-    MOZ_CRASH(explain);                                  \
+#define GMP_PATH_CRASH(explain)                           \
+  do {                                                    \
+    nsAutoString path;                                    \
+    if (!libFile || NS_FAILED(libFile->GetPath(path))) {  \
+      path = mPluginPath;                                 \
+    }                                                     \
+    CrashReporter::RecordAnnotationNSString(              \
+        CrashReporter::Annotation::GMPLibraryPath, path); \
+    MOZ_CRASH(explain);                                   \
   } while (false)
 
   nsresult rv = NS_NewLocalFile(mPluginPath, true, getter_AddRefs(libFile));
@@ -514,7 +513,7 @@ mozilla::ipc::IPCResult GMPChild::RecvStartPlugin(const nsString& aAdapter) {
 
   nsAutoCString libPath;
   if (!GetUTF8LibPath(libPath)) {
-    CrashReporter::AnnotateCrashReport(
+    CrashReporter::RecordAnnotationNSCString(
         CrashReporter::Annotation::GMPLibraryPath,
         NS_ConvertUTF16toUTF8(mPluginPath));
 
@@ -556,7 +555,7 @@ mozilla::ipc::IPCResult GMPChild::RecvStartPlugin(const nsString& aAdapter) {
     NS_WARNING("Failed to load GMP");
 #endif
     delete platformAPI;
-    CrashReporter::AnnotateCrashReport(
+    CrashReporter::RecordAnnotationNSCString(
         CrashReporter::Annotation::GMPLibraryPath,
         NS_ConvertUTF16toUTF8(mPluginPath));
 
@@ -727,21 +726,21 @@ mozilla::ipc::IPCResult GMPChild::RecvShutdown(ShutdownResolver&& aResolver) {
   }
 
   const bool isProfiling = profiler_is_active();
-  CrashReporter::AnnotateCrashReport(
+  CrashReporter::RecordAnnotationCString(
       CrashReporter::Annotation::ProfilerChildShutdownPhase,
-      isProfiling ? "Profiling - GrabShutdownProfileAndShutdown"_ns
-                  : "Not profiling - GrabShutdownProfileAndShutdown"_ns);
+      isProfiling ? "Profiling - GrabShutdownProfileAndShutdown"
+                  : "Not profiling - GrabShutdownProfileAndShutdown");
   ProfileAndAdditionalInformation shutdownProfileAndAdditionalInformation =
       mProfilerController->GrabShutdownProfileAndShutdown();
-  CrashReporter::AnnotateCrashReport(
+  CrashReporter::RecordAnnotationCString(
       CrashReporter::Annotation::ProfilerChildShutdownPhase,
-      isProfiling ? "Profiling - Destroying ChildProfilerController"_ns
-                  : "Not profiling - Destroying ChildProfilerController"_ns);
+      isProfiling ? "Profiling - Destroying ChildProfilerController"
+                  : "Not profiling - Destroying ChildProfilerController");
   mProfilerController = nullptr;
-  CrashReporter::AnnotateCrashReport(
+  CrashReporter::RecordAnnotationCString(
       CrashReporter::Annotation::ProfilerChildShutdownPhase,
-      isProfiling ? "Profiling - SendShutdownProfile (resovling)"_ns
-                  : "Not profiling - SendShutdownProfile (resolving)"_ns);
+      isProfiling ? "Profiling - SendShutdownProfile (resovling)"
+                  : "Not profiling - SendShutdownProfile (resolving)");
   if (const size_t len = shutdownProfileAndAdditionalInformation.SizeOf();
       len >= size_t(IPC::Channel::kMaximumMessageSize)) {
     shutdownProfileAndAdditionalInformation.mProfile =
@@ -752,10 +751,10 @@ mozilla::ipc::IPCResult GMPChild::RecvShutdown(ShutdownResolver&& aResolver) {
   // Send the shutdown profile to the parent process through our own
   // message channel, which we know will survive for long enough.
   aResolver(shutdownProfileAndAdditionalInformation.mProfile);
-  CrashReporter::AnnotateCrashReport(
+  CrashReporter::RecordAnnotationCString(
       CrashReporter::Annotation::ProfilerChildShutdownPhase,
-      isProfiling ? "Profiling - SendShutdownProfile (resolved)"_ns
-                  : "Not profiling - SendShutdownProfile (resolved)"_ns);
+      isProfiling ? "Profiling - SendShutdownProfile (resolved)"
+                  : "Not profiling - SendShutdownProfile (resolved)");
   return IPC_OK();
 }
 
diff --git a/dom/media/gmp/GMPDiskStorage.cpp b/dom/media/gmp/GMPDiskStorage.cpp
index 5f7a023b9b..c1c0c8215a 100644
--- a/dom/media/gmp/GMPDiskStorage.cpp
+++ b/dom/media/gmp/GMPDiskStorage.cpp
@@ -13,7 +13,6 @@
 #include "mozilla/EndianUtils.h"
 #include "nsClassHashtable.h"
 #include "prio.h"
-#include "nsContentCID.h"
 #include "nsServiceManagerUtils.h"
 
 namespace mozilla::gmp {
diff --git a/dom/media/gmp/GMPLoader.cpp b/dom/media/gmp/GMPLoader.cpp
index 9fa7756165..c0c9364c7b 100644
--- a/dom/media/gmp/GMPLoader.cpp
+++ b/dom/media/gmp/GMPLoader.cpp
@@ -84,7 +84,7 @@ class PassThroughGMPAdapter : public GMPAdapter {
 
 bool GMPLoader::Load(const char* aUTF8LibPath, uint32_t aUTF8LibPathLen,
                      const GMPPlatformAPI* aPlatformAPI, GMPAdapter* aAdapter) {
-  CrashReporter::AutoAnnotateCrashReport autoLibPath(
+  CrashReporter::AutoRecordAnnotation autoLibPath(
       CrashReporter::Annotation::GMPLibraryPath,
       nsDependentCString(aUTF8LibPath));
 
diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
index 115e9b7392..0830313be9 100644
--- a/dom/media/gmp/GMPParent.cpp
+++ b/dom/media/gmp/GMPParent.cpp
@@ -770,13 +770,15 @@ bool GMPParent::EnsureProcessLoaded() {
 
 void GMPParent::AddCrashAnnotations() {
   if (mCrashReporter) {
-    mCrashReporter->AddAnnotation(CrashReporter::Annotation::GMPPlugin, true);
-    mCrashReporter->AddAnnotation(CrashReporter::Annotation::PluginFilename,
-                                  NS_ConvertUTF16toUTF8(mName));
-    mCrashReporter->AddAnnotation(CrashReporter::Annotation::PluginName,
-                                  mDisplayName);
-    mCrashReporter->AddAnnotation(CrashReporter::Annotation::PluginVersion,
-                                  mVersion);
+    mCrashReporter->AddAnnotationBool(CrashReporter::Annotation::GMPPlugin,
+                                      true);
+    mCrashReporter->AddAnnotationNSCString(
+        CrashReporter::Annotation::PluginFilename,
+        NS_ConvertUTF16toUTF8(mName));
+    mCrashReporter->AddAnnotationNSCString(
+        CrashReporter::Annotation::PluginName, mDisplayName);
+    mCrashReporter->AddAnnotationNSCString(
+        CrashReporter::Annotation::PluginVersion, mVersion);
   }
 }
 
diff --git a/dom/media/gmp/moz.build b/dom/media/gmp/moz.build
index a2b1be5ed8..3c34021506 100644
--- a/dom/media/gmp/moz.build
+++ b/dom/media/gmp/moz.build
@@ -126,7 +126,7 @@ PREPROCESSED_IPDL_SOURCES += [
     "PGMPContent.ipdl",
 ]
 
-if CONFIG["OS_TARGET"] in ["WINNT", "Darwin"]:
+if CONFIG["TARGET_OS"] in ["WINNT", "OSX"]:
     DEFINES["SUPPORT_STORAGE_ID"] = 1
 
 include("/ipc/chromium/chromium-config.mozbuild")
diff --git a/dom/media/gmp/rlz/moz.build b/dom/media/gmp/rlz/moz.build
index 8e2d9ea5d1..a874d54c65 100644
--- a/dom/media/gmp/rlz/moz.build
+++ b/dom/media/gmp/rlz/moz.build
@@ -9,19 +9,19 @@
 
 FINAL_LIBRARY = 'xul'
 
-if CONFIG['OS_TARGET'] in ['WINNT', 'Darwin']:
+if CONFIG['TARGET_OS'] in ['WINNT', 'OSX']:
     UNIFIED_SOURCES += [
         'lib/crc8.cc',
         'lib/machine_id.cc',
         'lib/string_utils.cc',
     ]
 
-if CONFIG['OS_TARGET'] == 'WINNT':
+if CONFIG['TARGET_OS'] == 'WINNT':
     UNIFIED_SOURCES += [
         'win/lib/machine_id_win.cc',
     ]
 
-if CONFIG['OS_TARGET'] == 'Darwin':
+if CONFIG['TARGET_OS'] == 'OSX':
     UNIFIED_SOURCES += [
         'mac/lib/machine_id_mac.cc',
     ]