tor-browser

commit 2a5b565c7ea65bfa248b96d48e48d283aadfb144
parent 6ddecb3767770548f7fe36f1d252faa670ce66c4
Author: serge-sans-paille <sguelton@mozilla.com>
Date:   Tue,  4 Nov 2025 07:43:05 +0000

Bug 1997861 - Make Modifier constexpr so that kModifierKeys can be MOZ_CONSTINIT r=emilio

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

Diffstat:
M
dom/base/FuzzingFunctions.cpp
 | 
29
+++++++++++++++--------------

1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/dom/base/FuzzingFunctions.cpp b/dom/base/FuzzingFunctions.cpp
@@ -87,25 +87,26 @@ struct ModifierKey final {
   KeyNameIndex mKeyNameIndex;
   bool mLockable;
 
-  ModifierKey(Modifier aModifier, KeyNameIndex aKeyNameIndex, bool aLockable)
+  constexpr ModifierKey(Modifier aModifier, KeyNameIndex aKeyNameIndex,
+                        bool aLockable)
       : mModifier(aModifier),
         mKeyNameIndex(aKeyNameIndex),
         mLockable(aLockable) {}
 };
 
-MOZ_RUNINIT static const ModifierKey kModifierKeys[] = {
-    ModifierKey(MODIFIER_ALT, KEY_NAME_INDEX_Alt, false),
-    ModifierKey(MODIFIER_ALTGRAPH, KEY_NAME_INDEX_AltGraph, false),
-    ModifierKey(MODIFIER_CONTROL, KEY_NAME_INDEX_Control, false),
-    ModifierKey(MODIFIER_FN, KEY_NAME_INDEX_Fn, false),
-    ModifierKey(MODIFIER_META, KEY_NAME_INDEX_Meta, false),
-    ModifierKey(MODIFIER_SHIFT, KEY_NAME_INDEX_Shift, false),
-    ModifierKey(MODIFIER_SYMBOL, KEY_NAME_INDEX_Symbol, false),
-    ModifierKey(MODIFIER_CAPSLOCK, KEY_NAME_INDEX_CapsLock, true),
-    ModifierKey(MODIFIER_FNLOCK, KEY_NAME_INDEX_FnLock, true),
-    ModifierKey(MODIFIER_NUMLOCK, KEY_NAME_INDEX_NumLock, true),
-    ModifierKey(MODIFIER_SCROLLLOCK, KEY_NAME_INDEX_ScrollLock, true),
-    ModifierKey(MODIFIER_SYMBOLLOCK, KEY_NAME_INDEX_SymbolLock, true),
+static constexpr ModifierKey kModifierKeys[] = {
+    {MODIFIER_ALT, KEY_NAME_INDEX_Alt, false},
+    {MODIFIER_ALTGRAPH, KEY_NAME_INDEX_AltGraph, false},
+    {MODIFIER_CONTROL, KEY_NAME_INDEX_Control, false},
+    {MODIFIER_FN, KEY_NAME_INDEX_Fn, false},
+    {MODIFIER_META, KEY_NAME_INDEX_Meta, false},
+    {MODIFIER_SHIFT, KEY_NAME_INDEX_Shift, false},
+    {MODIFIER_SYMBOL, KEY_NAME_INDEX_Symbol, false},
+    {MODIFIER_CAPSLOCK, KEY_NAME_INDEX_CapsLock, true},
+    {MODIFIER_FNLOCK, KEY_NAME_INDEX_FnLock, true},
+    {MODIFIER_NUMLOCK, KEY_NAME_INDEX_NumLock, true},
+    {MODIFIER_SCROLLLOCK, KEY_NAME_INDEX_ScrollLock, true},
+    {MODIFIER_SYMBOLLOCK, KEY_NAME_INDEX_SymbolLock, true},
 };
 
 /* static */