Bug 1563996 - Make dom.ipc.cpows.log.{enabled,stack} static prefs. r=sfink

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

--HG--
extra : moz-landing-system : lando

js/ipc/JavaScriptShared.cpp

@@ -99,8 +99,8 @@ void ObjectToIdMap::remove(JSObject* obj) { table_.remove(obj); }
 void ObjectToIdMap::clear() { table_.clear(); }
 
 bool JavaScriptShared::sLoggingInitialized;
-bool JavaScriptShared::sLoggingEnabled;
-bool JavaScriptShared::sStackLoggingEnabled;
+bool JavaScriptShared::sLoggingEnabledByEnvVar;
+bool JavaScriptShared::sStackLoggingEnabledByEnvVar;
 
 JavaScriptShared::JavaScriptShared()
     : refcount_(1), nextSerialNumber_(1), nextCPOWNumber_(1) {
@@ -108,13 +108,9 @@ JavaScriptShared::JavaScriptShared()
     sLoggingInitialized = true;
 
     if (PR_GetEnv("MOZ_CPOW_LOG")) {
-      sLoggingEnabled = true;
-      sStackLoggingEnabled = strstr(PR_GetEnv("MOZ_CPOW_LOG"), "stacks");
-    } else {
-      Preferences::AddBoolVarCache(&sLoggingEnabled,
-                                   "dom.ipc.cpows.log.enabled", false);
-      Preferences::AddBoolVarCache(&sStackLoggingEnabled,
-                                   "dom.ipc.cpows.log.stack", false);
+      sLoggingEnabledByEnvVar = true;
+      sStackLoggingEnabledByEnvVar =
+          !!strstr(PR_GetEnv("MOZ_CPOW_LOG"), "stacks");
     }
   }
 }

js/ipc/JavaScriptShared.h

@@ -196,8 +196,13 @@ class JavaScriptShared : public CPOWManager {
   }
 #endif
 
-  static bool LoggingEnabled() { return sLoggingEnabled; }
-  static bool StackLoggingEnabled() { return sStackLoggingEnabled; }
+  static bool LoggingEnabled() {
+    return sLoggingEnabledByEnvVar || StaticPrefs::dom_ipc_cpows_log_enabled();
+  }
+  static bool StackLoggingEnabled() {
+    return sStackLoggingEnabledByEnvVar ||
+           StaticPrefs::dom_ipc_cpows_log_stack();
+  }
 
   friend class Logging;
 
@@ -239,8 +244,8 @@ class JavaScriptShared : public CPOWManager {
   }
 
   static bool sLoggingInitialized;
-  static bool sLoggingEnabled;
-  static bool sStackLoggingEnabled;
+  static bool sLoggingEnabledByEnvVar;
+  static bool sStackLoggingEnabledByEnvVar;
 };
 
 }  // namespace jsipc

modules/libpref/init/StaticPrefList.h

@@ -1587,6 +1587,20 @@ VARCACHE_PREF(
   bool, false
 )
 
+VARCACHE_PREF(
+  Live,
+  "dom.ipc.cpows.log.enabled",
+   dom_ipc_cpows_log_enabled,
+  bool, false
+)
+
+VARCACHE_PREF(
+  Live,
+  "dom.ipc.cpows.log.stack",
+   dom_ipc_cpows_log_stack,
+  bool, false
+)
+
 // If this is true, "keypress" event's keyCode value and charCode value always
 // become same if the event is not created/initialized by JS.
 VARCACHE_PREF(