tor-browser

commit f8479b2158358ad6ebd1c3eaeab2a3f6864401a9
parent c5764046d1760cfd3781b1c934affca04f11257f
Author: Chris Peterson <cpeterson@mozilla.com>
Date:   Tue,  9 Dec 2025 00:01:28 +0000

Bug 2002864 - Replace MOZ_CONSTINIT with C++20 constinit in dom/media code. r=media-playback-reviewers,webrtc-reviewers,aosmond,pehrsons

Differential Revision: https://phabricator.services.mozilla.com/D274501

Diffstat:
M
dom/media/ExternalEngineStateMachine.cpp
 | 
2
+-
M
dom/media/eme/MediaKeySystemAccess.cpp
 | 
2
+-
M
dom/media/gtest/TestMediaDataDecoder.cpp
 | 
9
+++++----
M
dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
 | 
2
+-
M
dom/media/platforms/wmf/WMF.h
 | 
3
+--
M
dom/media/webrtc/tests/fuzztests/sdp_parser_libfuzz.cpp
 | 
2
+-

6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dom/media/ExternalEngineStateMachine.cpp b/dom/media/ExternalEngineStateMachine.cpp
@@ -139,7 +139,7 @@ class ProcessCrashMonitor final {
 };
 
 StaticMutex ProcessCrashMonitor::sMutex;
-MOZ_CONSTINIT UniquePtr<ProcessCrashMonitor> ProcessCrashMonitor::sCrashMonitor;
+constinit UniquePtr<ProcessCrashMonitor> ProcessCrashMonitor::sCrashMonitor;
 Atomic<bool> ProcessCrashMonitor::sIsShutdown{false};
 
 /* static */
diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -45,7 +45,7 @@ namespace mozilla::dom {
 #ifdef MOZ_WMF_CDM
 #  include "nsIWindowsMediaFoundationCDMOriginsListService.h"
 
-MOZ_CONSTINIT static nsTArray<IPCOriginStatusEntry> sOriginStatusEntries;
+constinit static nsTArray<IPCOriginStatusEntry> sOriginStatusEntries;
 #endif
 
 #define LOG(msg, ...) \
diff --git a/dom/media/gtest/TestMediaDataDecoder.cpp b/dom/media/gtest/TestMediaDataDecoder.cpp
@@ -43,10 +43,11 @@ class PropertyTest : public ::testing::TestWithParam<ParamType> {
   static UniquePtr<VideoInfo> sAVCInfo;
   static UniquePtr<VideoInfo> sVP9Info;
 };
-MOZ_CONSTINIT RefPtr<PDMFactory> PropertyTest::sFactory;
-MOZ_CONSTINIT RefPtr<TaskQueue> PropertyTest::sTaskQueue;
-MOZ_CONSTINIT UniquePtr<VideoInfo> PropertyTest::sAVCInfo;
-MOZ_CONSTINIT UniquePtr<VideoInfo> PropertyTest::sVP9Info;
+
+constinit RefPtr<PDMFactory> PropertyTest::sFactory;
+constinit RefPtr<TaskQueue> PropertyTest::sTaskQueue;
+constinit UniquePtr<VideoInfo> PropertyTest::sAVCInfo;
+constinit UniquePtr<VideoInfo> PropertyTest::sVP9Info;
 
 void CheckEquals(VideoInfo& aVideoInfo, MDD::PropertyName aPropertyName,
                  const Maybe<MDD::PropertyValue>&& aExpectedValue,
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
@@ -123,7 +123,7 @@ typedef mozilla::layers::BufferRecycleBin BufferRecycleBin;
 namespace mozilla {
 
 #if defined(MOZ_USE_HWDECODE) && defined(MOZ_WIDGET_GTK)
-MOZ_CONSTINIT nsTArray<AVCodecID>
+constinit nsTArray<AVCodecID>
     FFmpegVideoDecoder<LIBAV_VER>::mAcceleratedFormats;
 #endif
 
diff --git a/dom/media/platforms/wmf/WMF.h b/dom/media/platforms/wmf/WMF.h
@@ -141,8 +141,7 @@ class MediaFoundationInitializer final {
   // WMF from threads with the same COM compartment model.
   HRESULT MFShutdown();
 
-  MOZ_CONSTINIT static inline UniquePtr<MediaFoundationInitializer>
-      sInitializer;
+  constinit static inline UniquePtr<MediaFoundationInitializer> sInitializer;
   static inline StaticMutex sCreateMutex;
   static inline Atomic<bool> sIsShutdown{false};
   const bool mHasInitialized;
diff --git a/dom/media/webrtc/tests/fuzztests/sdp_parser_libfuzz.cpp b/dom/media/webrtc/tests/fuzztests/sdp_parser_libfuzz.cpp
@@ -12,7 +12,7 @@
 
 using namespace mozilla;
 
-MOZ_CONSTINIT static mozilla::UniquePtr<SdpParser::Results> sdpPtr;
+constinit static mozilla::UniquePtr<SdpParser::Results> sdpPtr;
 MOZ_RUNINIT static SipccSdpParser mParser;
 
 int FuzzingInitSdpParser(int* argc, char*** argv) { return 0; }