tor-browser

commit 8a1844ab86dc65e028a63c01de8c2284cf4eb176
parent 2877325b4dcb8fe592485bbd4c87a7683ce11880
Author: Chris Peterson <cpeterson@mozilla.com>
Date:   Tue,  9 Dec 2025 00:01:31 +0000

Bug 2002864 - Replace MOZ_CONSTINIT with C++20 constinit in widget/gtk. r=emilio

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

Diffstat:
M
widget/gtk/DMABufSurface.cpp
 | 
2
+-
M
widget/gtk/WaylandVsyncSource.cpp
 | 
2
+-
M
widget/gtk/nsClipboard.cpp
 | 
4
++--

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/widget/gtk/DMABufSurface.cpp b/widget/gtk/DMABufSurface.cpp
@@ -131,7 +131,7 @@ static const std::string FormatEGLError(EGLint err) {
   }
 }
 
-MOZ_CONSTINIT static RefPtr<GLContext> sSnapshotContext;
+constinit static RefPtr<GLContext> sSnapshotContext;
 static StaticMutex sSnapshotContextMutex MOZ_UNANNOTATED;
 MOZ_RUNINIT static Atomic<int> gNewSurfaceUID(getpid());
 /* Memory reporter stuff */
diff --git a/widget/gtk/WaylandVsyncSource.cpp b/widget/gtk/WaylandVsyncSource.cpp
@@ -41,7 +41,7 @@ static float GetFPS(TimeDuration aVsyncRate) {
   return 1000.0f / float(aVsyncRate.ToMilliseconds());
 }
 
-MOZ_CONSTINIT static nsTArray<WaylandVsyncSource*> gWaylandVsyncSources;
+constinit static nsTArray<WaylandVsyncSource*> gWaylandVsyncSources;
 
 Maybe<TimeDuration> WaylandVsyncSource::GetFastestVsyncRate() {
   Maybe<TimeDuration> retVal;
diff --git a/widget/gtk/nsClipboard.cpp b/widget/gtk/nsClipboard.cpp
@@ -68,8 +68,8 @@ static const char kURIListMime[] = "text/uri-list";
 // just KDE.
 static const char kKDEPasswordManagerHintMime[] = "x-kde-passwordManagerHint";
 
-MOZ_CONSTINIT ClipboardTargets nsRetrievalContext::sClipboardTargets;
-MOZ_CONSTINIT ClipboardTargets nsRetrievalContext::sPrimaryTargets;
+constinit ClipboardTargets nsRetrievalContext::sClipboardTargets;
+constinit ClipboardTargets nsRetrievalContext::sPrimaryTargets;
 
 // Callback when someone asks us for the data
 static void clipboard_get_cb(GtkClipboard* aGtkClipboard,