Bug 1752332: Rename ShouldSyncPreference to ShouldSanitizePreference …

…r=KrisWright This simplifies the number of negations needed, and makes things easy to understand. I think anyway; I know that without renaming it I made several annoying-to-diagnose negation errors... Depends on D141411 Differential Revision: https://phabricator.services.mozilla.com/D141412
iaxat · Apr 20, 2022 · 1a2f91c · 1a2f91c
1 parent 1431a4f
commit 1a2f91c
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 31 deletions.
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -2510,7 +2510,7 @@ bool ContentParent::BeginSubprocessLaunch(ProcessPriority aPriority) {
   // Instantiate the pref serializer. It will be cleaned up in
   // `LaunchSubprocessReject`/`LaunchSubprocessResolve`.
   mPrefSerializer = MakeUnique<mozilla::ipc::SharedPreferenceSerializer>(
-      ShouldSyncPreference);
+      ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory()) {
     NS_WARNING("SharedPreferenceSerializer::SerializeToSharedMemory failed");
     MarkAsDead();
@@ -3633,8 +3633,8 @@ ContentParent::Observe(nsISupports* aSubject, const char* aTopic,
     NS_LossyConvertUTF16toASCII strData(aData);
 
     // A pref changed. If it is useful to do so, inform child processes.
-    if (!ShouldSyncPreference(strData.Data(),
-                              /* will be fixed later */ false)) {
+    if (ShouldSanitizePreference(strData.Data(),
+                                 /* will be fixed later */ false)) {
       return NS_OK;
     }
 

diff --git a/dom/media/ipc/RDDProcessHost.cpp b/dom/media/ipc/RDDProcessHost.cpp
@@ -47,7 +47,7 @@ bool RDDProcessHost::Launch(StringVector aExtraOpts) {
   MOZ_ASSERT(!mRDDChild);
 
   mPrefSerializer =
-      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSyncPreference);
+      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory()) {
     return false;
   }

diff --git a/dom/media/ipc/RDDProcessManager.cpp b/dom/media/ipc/RDDProcessManager.cpp
@@ -97,10 +97,9 @@ void RDDProcessManager::OnPreferenceChange(const char16_t* aData) {
   NS_LossyConvertUTF16toASCII strData(aData);
 
   // A pref changed. If it is useful to do so, inform child processes.
-  if (!ShouldSyncPreference(strData.Data(), false)) {
+  if (ShouldSanitizePreference(strData.Data(), false)) {
     return;
   }
-
   mozilla::dom::Pref pref(strData, /* isLocked */ false,
                           /* isSanitized */ false, Nothing(), Nothing());
   Preferences::GetPreference(&pref);

diff --git a/gfx/ipc/GPUProcessHost.cpp b/gfx/ipc/GPUProcessHost.cpp
@@ -43,7 +43,7 @@ bool GPUProcessHost::Launch(StringVector aExtraOpts) {
   MOZ_ASSERT(!gfxPlatform::IsHeadless());
 
   mPrefSerializer =
-      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSyncPreference);
+      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory()) {
     return false;
   }

diff --git a/gfx/ipc/GPUProcessManager.cpp b/gfx/ipc/GPUProcessManager.cpp
@@ -164,10 +164,9 @@ void GPUProcessManager::OnPreferenceChange(const char16_t* aData) {
   NS_LossyConvertUTF16toASCII strData(aData);
 
   // A pref changed. If it is useful to do so, inform child processes.
-  if (!ShouldSyncPreference(strData.Data(), false)) {
+  if (ShouldSanitizePreference(strData.Data(), false)) {
     return;
   }
-
   mozilla::dom::Pref pref(strData, /* isLocked */ false,
                           /* isSanitized */ false, Nothing(), Nothing());
   Preferences::GetPreference(&pref);

diff --git a/gfx/vr/ipc/VRProcessManager.cpp b/gfx/vr/ipc/VRProcessManager.cpp
@@ -217,10 +217,9 @@ void VRProcessManager::OnPreferenceChange(const char16_t* aData) {
   NS_LossyConvertUTF16toASCII strData(aData);
 
   // A pref changed. If it is useful to do so, inform child processes.
-  if (!ShouldSyncPreference(strData.Data(), false)) {
+  if (ShouldSanitizePreference(strData.Data(), false)) {
     return;
   }
-
   mozilla::dom::Pref pref(strData, /* isLocked */ false,
                           /* isSanitized */ false, Nothing(), Nothing());
   Preferences::GetPreference(&pref);

diff --git a/gfx/vr/ipc/VRProcessParent.cpp b/gfx/vr/ipc/VRProcessParent.cpp
@@ -56,7 +56,7 @@ bool VRProcessParent::Launch() {
   ProcessChild::AddPlatformBuildID(extraArgs);
 
   mPrefSerializer =
-      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSyncPreference);
+      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory()) {
     return false;
   }

diff --git a/ipc/glue/ProcessUtils.h b/ipc/glue/ProcessUtils.h
@@ -26,7 +26,7 @@ void SetThisProcessName(const char* aName);
 class SharedPreferenceSerializer final {
  public:
   explicit SharedPreferenceSerializer(
-      std::function<bool(const char*, bool)>&& aShouldSerializeFn);
+      std::function<bool(const char*, bool)>&& aShouldSanitizeFn);
   SharedPreferenceSerializer(SharedPreferenceSerializer&& aOther);
   ~SharedPreferenceSerializer();
 
@@ -48,7 +48,7 @@ class SharedPreferenceSerializer final {
   size_t mPrefsLength;
   UniqueFileHandle mPrefMapHandle;
   UniqueFileHandle mPrefsHandle;
-  std::function<bool(const char*, bool)> mShouldSerializeFn;
+  std::function<bool(const char*, bool)> mShouldSanitizeFn;
 };
 
 class SharedPreferenceDeserializer final {

diff --git a/ipc/glue/ProcessUtils_common.cpp b/ipc/glue/ProcessUtils_common.cpp
@@ -18,8 +18,8 @@ namespace mozilla {
 namespace ipc {
 
 SharedPreferenceSerializer::SharedPreferenceSerializer(
-    std::function<bool(const char*, bool)>&& aShouldSerializeFn)
-    : mPrefMapSize(0), mPrefsLength(0), mShouldSerializeFn(aShouldSerializeFn) {
+    std::function<bool(const char*, bool)>&& aShouldSanitizeFn)
+    : mPrefMapSize(0), mPrefsLength(0), mShouldSanitizeFn(aShouldSanitizeFn) {
   MOZ_COUNT_CTOR(SharedPreferenceSerializer);
 }
 
@@ -42,7 +42,7 @@ bool SharedPreferenceSerializer::SerializeToSharedMemory() {
 
   // Serialize the early prefs.
   nsAutoCStringN<1024> prefs;
-  Preferences::SerializePreferences(prefs, mShouldSerializeFn);
+  Preferences::SerializePreferences(prefs, mShouldSanitizeFn);
   mPrefsLength = prefs.Length();
 
   base::SharedMemory shm;

diff --git a/ipc/glue/UtilityProcessHost.cpp b/ipc/glue/UtilityProcessHost.cpp
@@ -61,7 +61,7 @@ bool UtilityProcessHost::Launch(StringVector aExtraOpts) {
   MOZ_ASSERT(!mUtilityProcessParent);
 
   mPrefSerializer =
-      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSyncPreference);
+      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory()) {
     return false;
   }

diff --git a/ipc/glue/UtilityProcessManager.cpp b/ipc/glue/UtilityProcessManager.cpp
@@ -95,7 +95,7 @@ void UtilityProcessManager::OnPreferenceChange(const char16_t* aData) {
   NS_LossyConvertUTF16toASCII strData(aData);
 
   // A pref changed. If it is useful to do so, inform child processes.
-  if (!ShouldSyncPreference(strData.Data(), false)) {
+  if (ShouldSanitizePreference(strData.Data(), false)) {
     return;
   }
 

diff --git a/ipc/ipdl/test/gtest/IPDLUnitTest.cpp b/ipc/ipdl/test/gtest/IPDLUnitTest.cpp
@@ -50,7 +50,7 @@ already_AddRefed<IPDLUnitTestParent> IPDLUnitTestParent::CreateCrossProcess() {
   std::vector<std::string> extraArgs;
 
   auto prefSerializer = MakeUnique<ipc::SharedPreferenceSerializer>(
-      ShouldSyncPreference);
+      ShouldSanitizePreference);
   if (!prefSerializer->SerializeToSharedMemory()) {
     ADD_FAILURE()
         << "SharedPreferenceSerializer::SerializeToSharedMemory failed";

diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
@@ -3588,7 +3588,7 @@ NS_IMPL_ISUPPORTS(Preferences, nsIPrefService, nsIObserver, nsIPrefBranch,
 /* static */
 void Preferences::SerializePreferences(
     nsCString& aStr,
-    const std::function<bool(const char*, bool)>& aShouldSerializeFn) {
+    const std::function<bool(const char*, bool)>& aShouldSanitizeFn) {
   MOZ_RELEASE_ASSERT(InitStaticMembers());
 
   aStr.Truncate();
@@ -3597,8 +3597,8 @@ void Preferences::SerializePreferences(
     Pref* pref = iter.get().get();
     if (!pref->IsTypeNone() && pref->HasAdvisablySizedValues()) {
       pref->SerializeAndAppend(
-          aStr, !aShouldSerializeFn(pref->Name(),
-                                    /* will be fixed later */ false));
+          aStr,
+          aShouldSanitizeFn(pref->Name(), /* will be fixed later */ false));
     }
   }
 
@@ -5675,7 +5675,8 @@ namespace mozilla {
 
 void UnloadPrefsModule() { Preferences::Shutdown(); }
 
-bool ShouldSyncPreference(const char* aPref, bool aIsDestWebContentProcess) {
+bool ShouldSanitizePreference(const char* aPref,
+                              bool aIsDestWebContentProcess) {
 #define PREF_LIST_ENTRY(s) \
   { s, (sizeof(s) / sizeof(char)) - 1 }
   struct PrefListEntry {
@@ -5700,11 +5701,11 @@ bool ShouldSyncPreference(const char* aPref, bool aIsDestWebContentProcess) {
 
   for (const auto& entry : sParentOnlyPrefBranchList) {
     if (strncmp(entry.mPrefBranch, aPref, entry.mLen) == 0) {
-      return false;
+      return true;
     }
   }
 
-  return true;
+  return false;
 }
 
 }  // namespace mozilla

diff --git a/modules/libpref/Preferences.h b/modules/libpref/Preferences.h
@@ -532,7 +532,7 @@ class Preferences final : public nsIPrefService,
   static bool InitStaticMembers();
 };
 
-bool ShouldSyncPreference(const char* aPref, bool aIsDestWebContentProcess);
+bool ShouldSanitizePreference(const char* aPref, bool aIsDestWebContentProcess);
 
 }  // namespace mozilla
 

diff --git a/modules/libpref/test/gtest/Basics.cpp b/modules/libpref/test/gtest/Basics.cpp
@@ -44,11 +44,13 @@ TEST(PrefsBasics, Serialize)
 
   nsCString str;
   Preferences::SerializePreferences(
-      str, [](const char* aPref, bool) -> bool { return false; });
-  ASSERT_STREQ(str.Data(), "");
+      str, [](const char* aPref, bool) -> bool { return true; });
+  // Assert everything was marked sanitized
+  ASSERT_EQ(nullptr, strstr(str.Data(), "--:"));
 
   Preferences::SerializePreferences(str, [](const char* aPref, bool) -> bool {
     return strncmp(aPref, "foo.bool", 8) == 0;
   });
-  ASSERT_STREQ(str.Data(), "B-:8/foo.bool:T:F\n");
+  // Assert the sanitized serializtion was found
+  ASSERT_NE(nullptr, strstr(str.Data(), "B-S:8/foo.bool:T:\n"));
 }
diff --git a/netwerk/ipc/SocketProcessHost.cpp b/netwerk/ipc/SocketProcessHost.cpp
@@ -68,7 +68,7 @@ bool SocketProcessHost::Launch() {
   std::vector<std::string> extraArgs;
   ProcessChild::AddPlatformBuildID(extraArgs);
 
-  SharedPreferenceSerializer prefSerializer(ShouldSyncPreference);
+  SharedPreferenceSerializer prefSerializer(ShouldSanitizePreference);
   if (!prefSerializer.SerializeToSharedMemory()) {
     return false;
   }