Bug 1772599 - Set pref sanitizations prefs in the content process r=K…

…risWright Differential Revision: https://phabricator.services.mozilla.com/D148311
dothq · Jun 22, 2022 · b05c0bc · b05c0bc
1 parent d919f20
commit b05c0bc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
@@ -1411,6 +1411,11 @@ void ContentChild::InitXPCOM(
   // channel.
   RemoteDecoderManagerChild::Init();
 
+  Preferences::RegisterCallbackAndCall(&OnFissionBlocklistPrefChange,
+                                       kFissionEnforceBlockList);
+  Preferences::RegisterCallbackAndCall(&OnFissionBlocklistPrefChange,
+                                       kFissionOmitBlockListValues);
+
   // Set the dynamic scalar definitions for this process.
   TelemetryIPC::AddDynamicScalarDefinitions(aXPCOMInit.dynamicScalarDefs());
 }

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -645,23 +645,6 @@ static const char* sObserverTopics[] = {
     DEFAULT_TIMEZONE_CHANGED_OBSERVER_TOPIC,
 };
 
-static const char kFissionEnforceBlockList[] =
-    "fission.enforceBlocklistedPrefsInSubprocesses";
-static const char kFissionOmitBlockListValues[] =
-    "fission.omitBlocklistedPrefsInSubprocesses";
-
-static void OnFissionBlocklistPrefChange(const char* aPref, void* aData) {
-  if (strcmp(aPref, kFissionEnforceBlockList) == 0) {
-    sCrashOnBlocklistedPref =
-        StaticPrefs::fission_enforceBlocklistedPrefsInSubprocesses();
-  } else if (strcmp(aPref, kFissionOmitBlockListValues) == 0) {
-    sOmitBlocklistedPrefValues =
-        StaticPrefs::fission_omitBlocklistedPrefsInSubprocesses();
-  } else {
-    MOZ_CRASH("Unknown pref passed to callback");
-  }
-}
-
 // PreallocateProcess is called by the PreallocatedProcessManager.
 // ContentParent then takes this process back within GetNewOrUsedBrowserProcess.
 /*static*/ already_AddRefed<ContentParent>

diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
@@ -5897,6 +5897,18 @@ bool ShouldSanitizePreference(const char* aPrefName,
 Atomic<bool, Relaxed> sOmitBlocklistedPrefValues(false);
 Atomic<bool, Relaxed> sCrashOnBlocklistedPref(false);
 
+void OnFissionBlocklistPrefChange(const char* aPref, void* aData) {
+  if (strcmp(aPref, kFissionEnforceBlockList) == 0) {
+    sCrashOnBlocklistedPref =
+        StaticPrefs::fission_enforceBlocklistedPrefsInSubprocesses();
+  } else if (strcmp(aPref, kFissionOmitBlockListValues) == 0) {
+    sOmitBlocklistedPrefValues =
+        StaticPrefs::fission_omitBlocklistedPrefsInSubprocesses();
+  } else {
+    MOZ_CRASH("Unknown pref passed to callback");
+  }
+}
+
 }  // namespace mozilla
 
 // This file contains the C wrappers for the C++ static pref getters, as used

diff --git a/modules/libpref/Preferences.h b/modules/libpref/Preferences.h
@@ -539,6 +539,13 @@ extern Atomic<bool, Relaxed> sCrashOnBlocklistedPref;
 
 bool ShouldSanitizePreference(const char* aPref, bool aIsDestWebContentProcess);
 
+const char kFissionEnforceBlockList[] =
+    "fission.enforceBlocklistedPrefsInSubprocesses";
+const char kFissionOmitBlockListValues[] =
+    "fission.omitBlocklistedPrefsInSubprocesses";
+
+void OnFissionBlocklistPrefChange(const char* aPref, void* aData);
+
 }  // namespace mozilla
 
 #endif  // mozilla_Preferences_h