Bug 1489844 - Port DOMPrefs to StaticPrefs - part 26 - browser_dom_window_dump_enabled, r=ehsan

dom/base/DOMPrefs.cpp

@@ -22,29 +22,24 @@ DOMPrefs::Initialize()
   DOMPrefs::DumpEnabled();
 #endif
 
-#define DOM_PREF(name, pref) DOMPrefs::name();
 #define DOM_WEBIDL_PREF(name)
 #define DOM_UINT32_PREF(name, pref, defaultValue) DOMPrefs::name();
 
 #include "DOMPrefsInternal.h"
 
-#undef DOM_PREF
 #undef DOM_WEBIDL_PREF
 #undef DOM_UINT32_PREF
 }
 
-#define DOM_PREF(name, pref)                                         \
-  /* static */ bool                                                  \
-  DOMPrefs::name()                                                   \
-  {                                                                  \
-    static bool initialized = false;                                 \
-    static Atomic<bool> cachedValue;                                 \
-    if (!initialized) {                                              \
-      initialized = true;                                            \
-      Preferences::AddAtomicBoolVarCache(&cachedValue, pref, false); \
-    }                                                                \
-    return cachedValue;                                              \
-  }
+/* static */ bool
+DOMPrefs::DumpEnabled()
+{
+#if !(defined(DEBUG) || defined(MOZ_ENABLE_JS_DUMP))
+  return StaticPrefs::browser_dom_window_dump_enabled();
+#else
+  return true;
+#endif
+}
 
 #define DOM_WEBIDL_PREF(name)                    \
   /* static */ bool                              \
@@ -53,7 +48,6 @@ DOMPrefs::Initialize()
     return StaticPrefs::name();                  \
   }
 
-
 #define DOM_UINT32_PREF(name, pref, defaultValue)                             \
   /* static */ uint32_t                                                       \
   DOMPrefs::name()                                                            \
@@ -67,19 +61,8 @@ DOMPrefs::Initialize()
     return cachedValue;                                                       \
   }
 
-#if !(defined(DEBUG) || defined(MOZ_ENABLE_JS_DUMP))
-DOM_PREF(DumpEnabled, "browser.dom.window.dump.enabled")
-#else
-/* static */ bool
-DOMPrefs::DumpEnabled()
-{
-  return true;
-}
-#endif
-
 #include "DOMPrefsInternal.h"
 
-#undef DOM_PREF
 #undef DOM_WEBIDL_PREF
 #undef DOM_UINT32_PREF
 

dom/base/DOMPrefs.h

@@ -19,13 +19,11 @@ public:
   // Returns true if the browser.dom.window.dump.enabled pref is set.
   static bool DumpEnabled();
 
-#define DOM_PREF(name, pref) static bool name();
 #define DOM_WEBIDL_PREF(name) static bool name(JSContext* aCx, JSObject* aObj);
 #define DOM_UINT32_PREF(name, pref, defaultValue) static uint32_t name();
 
 #include "DOMPrefsInternal.h"
 
-#undef DOM_PREF
 #undef DOM_WEBIDL_PREF
 #undef DOM_UINT32_PREF
 };

dom/base/DOMPrefsInternal.h

@@ -8,12 +8,6 @@
 // main-thread in DOM.
 // The format is as follows:
 //
-//   DOM_PREF(FooBar, "foo.bar")
-//
-//   * First argument is the name of the getter function.  This defines a
-//     DOMPrefs::FooBar()
-//   * The second argument is the name of the pref.
-//
 //   DOM_WEBIDL_PREF(foo_bar)
 //
 //   * This defines DOMPrefs::foo_bar(JSContext* aCx, JSObject* aObj) which

modules/libpref/init/StaticPrefList.h

@@ -354,6 +354,18 @@ VARCACHE_PREF(
 )
 #endif
 
+#ifdef MOZILLA_OFFICIAL
+# define PREF_VALUE false
+#else
+# define PREF_VALUE true
+#endif
+VARCACHE_PREF(
+  "browser.dom.window.dump.enabled",
+   browser_dom_window_dump_enabled,
+  RelaxedAtomicBool, PREF_VALUE
+)
+#undef PREF_VALUE
+
 //---------------------------------------------------------------------------
 // Clear-Site-Data prefs
 //---------------------------------------------------------------------------

modules/libpref/init/all.js

@@ -1059,13 +1059,6 @@ pref("toolkit.asyncshutdown.crash_timeout", 180000); // 3 minutes
 // Extra logging for AsyncShutdown barriers and phases
 pref("toolkit.asyncshutdown.log", false);
 
-#ifdef MOZILLA_OFFICIAL
-// enable JS dump() function.
-pref("browser.dom.window.dump.enabled", false, sticky);
-#else
-pref("browser.dom.window.dump.enabled", true, sticky);
-#endif
-
 // Controls whether EventEmitter module throws dump message on each emit
 pref("toolkit.dump.emit", false);