1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
diff -ru a/browser/components/preferences/main.js b/browser/components/preferences/main.js
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -589,7 +589,8 @@
document.getElementById("web-appearance-rfp-warning")?.remove();
const chooser = document.getElementById("web-appearance-chooser");
const container = document.getElementById("webAppearanceGroup");
- const rfp = Services.prefs.getBoolPref("privacy.resistFingerprinting", false);
+ const rfp = Services.prefs.getBoolPref("privacy.resistFingerprinting", false) &&
+ !Services.prefs.getBoolPref("privacy.override_rfp_for_color_scheme", false);
if (chooser) {
chooser.style.opacity = rfp ? "0.3" : "1";
@@ -623,6 +624,7 @@
},
};
Services.prefs.addObserver("privacy.resistFingerprinting", prefObserver);
+ Services.prefs.addObserver("privacy.override_rfp_for_color_scheme", prefObserver);
const ensurePaneReady = cb => {
const id = "webAppearanceGroup";
@@ -644,6 +646,7 @@
return () => {
FORCED_COLORS_QUERY.removeEventListener("change", emitChange);
Services.prefs.removeObserver("privacy.resistFingerprinting", prefObserver);
+ Services.prefs.removeObserver("privacy.override_rfp_for_color_scheme", prefObserver);
};
},
visible: () => {
diff -ru a/dom/base/Document.cpp b/dom/base/Document.cpp
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -20500,7 +20500,8 @@
ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
if (ShouldResistFingerprinting(RFPTarget::CSSPrefersColorScheme) &&
- aIgnoreRFP == IgnoreRFP::No) {
+ aIgnoreRFP == IgnoreRFP::No &&
+ !StaticPrefs::privacy_override_rfp_for_color_scheme()) {
return ColorScheme::Light;
}
diff -ru a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -16343,6 +16343,12 @@
value: false
mirror: always
+# Allows overriding RFP for only the dark/light pref
+- name: privacy.override_rfp_for_color_scheme
+ type: bool
+ value: false
+ mirror: always
+
# Enforce tracking protection in all modes.
- name: privacy.trackingprotection.enabled
type: bool
|