Bug 1419771 - Introduce DOMPreferences, a thread-safe access to preferences for DOM - part 19 - Resist finger-printing enabled, r=asuth

dom/base/DOMPreferences.cpp

@@ -53,6 +53,7 @@ PREF(OffscreenCanvasEnabled, "gfx.offscreencanvas.enabled")
 PREF(WebkitBlinkDirectoryPickerEnabled, "dom.webkitBlink.dirPicker.enabled")
 PREF(NetworkInformationEnabled, "dom.netinfo.enabled")
 PREF(FetchObserverEnabled, "dom.fetchObserver.enabled")
+PREF(ResistFingerprintingEnabled, "privacy.resistFingerprinting")
 
 #undef PREF
 

dom/base/DOMPreferences.h

@@ -87,6 +87,9 @@ public:
   // Returns true if the dom.fetchObserver.enabled pref is set.
   static bool FetchObserverEnabled();
   static bool FetchObserverEnabled(JSContext* aCx, JSObject* aObj);
+
+  // Returns true if the privacy.resistFingerprinting pref is set.
+  static bool ResistFingerprintingEnabled();
 };
 
 } // dom namespace

dom/base/nsContentUtils.cpp

@@ -2378,17 +2378,7 @@ nsContentUtils::IsCallerChrome()
 bool
 nsContentUtils::ShouldResistFingerprinting()
 {
-  if (NS_IsMainThread()) {
+  return DOMPreferences::ResistFingerprintingEnabled();
-    return nsRFPService::IsResistFingerprintingEnabled();
-  }
-
-  workers::WorkerPrivate* workerPrivate = workers::GetCurrentThreadWorkerPrivate();
-  if (NS_WARN_IF(!workerPrivate)) {
-    return false;
-  }
-  workerPrivate->AssertIsOnWorkerThread();
-
-  return workerPrivate->ResistFingerprintingEnabled();
 }
 
 bool

dom/html/ImageDocument.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ImageDocument.h"
+#include "mozilla/dom/DOMPreferences.h"
 #include "mozilla/dom/ImageDocumentBinding.h"
 #include "mozilla/dom/HTMLImageElement.h"
 #include "nsRect.h"
@@ -49,7 +50,7 @@
 //XXX A hack needed for Firefox's site specific zoom.
 static bool IsSiteSpecific()
 {
-  return !mozilla::Preferences::GetBool("privacy.resistFingerprinting", false) &&
+  return !mozilla::dom::DOMPreferences::ResistFingerprintingEnabled() &&
          mozilla::Preferences::GetBool("browser.zoom.siteSpecific", false);
 }
 

dom/workers/WorkerNavigator.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/DOMPreferences.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/PromiseWorkerProxy.h"
 #include "mozilla/dom/StorageManager.h"
@@ -81,11 +82,11 @@ WorkerNavigator::GetAppName(nsString& aAppName, CallerType aCallerType) const
   MOZ_ASSERT(workerPrivate);
 
   if ((!mProperties.mAppNameOverridden.IsEmpty() ||
-       workerPrivate->ResistFingerprintingEnabled()) &&
+       DOMPreferences::ResistFingerprintingEnabled()) &&
       !workerPrivate->UsesSystemPrincipal()) {
     // We will spoof this value when 'privacy.resistFingerprinting' is true.
     // See nsRFPService.h for spoofed value.
-    aAppName = workerPrivate->ResistFingerprintingEnabled() ?
+    aAppName = DOMPreferences::ResistFingerprintingEnabled() ?
       NS_LITERAL_STRING(SPOOFED_APPNAME) : mProperties.mAppNameOverridden;
   } else {
     aAppName = mProperties.mAppName;
@@ -100,11 +101,11 @@ WorkerNavigator::GetAppVersion(nsString& aAppVersion, CallerType aCallerType,
   MOZ_ASSERT(workerPrivate);
 
   if ((!mProperties.mAppVersionOverridden.IsEmpty() ||
-       workerPrivate->ResistFingerprintingEnabled()) &&
+       DOMPreferences::ResistFingerprintingEnabled()) &&
       !workerPrivate->UsesSystemPrincipal()) {
     // We will spoof this value when 'privacy.resistFingerprinting' is true.
     // See nsRFPService.h for spoofed value.
-    aAppVersion = workerPrivate->ResistFingerprintingEnabled() ?
+    aAppVersion = DOMPreferences::ResistFingerprintingEnabled() ?
       NS_LITERAL_STRING(SPOOFED_APPVERSION) : mProperties.mAppVersionOverridden;
   } else {
     aAppVersion = mProperties.mAppVersion;
@@ -119,11 +120,11 @@ WorkerNavigator::GetPlatform(nsString& aPlatform, CallerType aCallerType,
   MOZ_ASSERT(workerPrivate);
 
   if ((!mProperties.mPlatformOverridden.IsEmpty() ||
-       workerPrivate->ResistFingerprintingEnabled()) &&
+       DOMPreferences::ResistFingerprintingEnabled()) &&
       !workerPrivate->UsesSystemPrincipal()) {
     // We will spoof this value when 'privacy.resistFingerprinting' is true.
     // See nsRFPService.h for spoofed value.
-    aPlatform = workerPrivate->ResistFingerprintingEnabled() ?
+    aPlatform = DOMPreferences::ResistFingerprintingEnabled() ?
       NS_LITERAL_STRING(SPOOFED_PLATFORM) : mProperties.mPlatformOverridden;
   } else {
     aPlatform = mProperties.mPlatform;

dom/workers/WorkerPrefs.h

@@ -21,7 +21,6 @@
 //   * First argument is the name of the pref.
 //   * The name of the function that updates the new value of a pref.
 
-WORKER_SIMPLE_PREF("privacy.resistFingerprinting", ResistFingerprintingEnabled, RESISTFINGERPRINTING_ENABLED)
 WORKER_SIMPLE_PREF("devtools.enabled", DevToolsEnabled, DEVTOOLS_ENABLED)
 WORKER_PREF("intl.accept_languages", PrefLanguagesChanged)
 WORKER_PREF("general.appname.override", AppNameOverrideChanged)