Merging upstream version 126.0.

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

1 files changed, 30 insertions, 3 deletions

diff --git a/dom/ipc/MMPrinter.h b/dom/ipc/MMPrinter.h
index 7d89f9ee8f..1d00bfc2e6 100644
--- a/dom/ipc/MMPrinter.h
+++ b/dom/ipc/MMPrinter.h
@@ -7,6 +7,7 @@
 #ifndef MMPrinter_h
 #define MMPrinter_h
 
+#include "mozilla/Maybe.h"
 #include "mozilla/dom/DOMTypes.h"
 #include "nsString.h"
 
@@ -17,14 +18,40 @@ class MMPrinter {
   static void Print(char const* aLocation, const nsAString& aMsg,
                     ClonedMessageData const& aData) {
     if (MOZ_UNLIKELY(MOZ_LOG_TEST(MMPrinter::sMMLog, LogLevel::Debug))) {
-      MMPrinter::PrintImpl(aLocation, aMsg, aData);
+      Maybe<uint64_t> msgId = MMPrinter::PrintHeader(aLocation, aMsg);
+      if (!msgId.isSome()) {
+        return;
+      }
+      MMPrinter::PrintData(*msgId, aData);
+    }
+  }
+
+  static void Print(char const* aLocation, const nsACString& aActorName,
+                    const nsAString& aMessageName,
+                    const Maybe<ClonedMessageData>& aData) {
+    if (MOZ_UNLIKELY(MOZ_LOG_TEST(MMPrinter::sMMLog, LogLevel::Debug))) {
+      Maybe<uint64_t> msgId = MMPrinter::PrintHeader(
+          aLocation,
+          NS_ConvertUTF8toUTF16(aActorName + " - "_ns) + aMessageName);
+
+      if (!msgId.isSome()) {
+        return;
+      }
+
+      if (aData.isSome()) {
+        MMPrinter::PrintData(*msgId, *aData);
+      } else {
+        MMPrinter::PrintNoData(*msgId);
+      }
     }
   }
 
  private:
   static LazyLogModule sMMLog;
-  static void PrintImpl(char const* aLocation, const nsAString& aMsg,
-                        ClonedMessageData const& aData);
+  static Maybe<uint64_t> PrintHeader(char const* aLocation,
+                                     const nsAString& aMsg);
+  static void PrintNoData(uint64_t aMsgId);
+  static void PrintData(uint64_t aMsgId, ClonedMessageData const& aData);
 };
 
 }  // namespace mozilla::dom