mirror of
https://codeberg.org/librewolf/source.git
synced 2024-12-22 21:53:31 -05:00
Merge branch 'main' into 'main'
Fix allow_dark_preference_with_rfp.patch See merge request librewolf-community/browser/source!50
This commit is contained in:
commit
990c76bdc9
1 changed files with 13 additions and 11 deletions
|
@ -1,20 +1,22 @@
|
||||||
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
|
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
|
||||||
index ce2cbca..60fda48 100644
|
index f49f4ac..45c0e95 100644
|
||||||
--- a/dom/base/Document.cpp
|
--- a/dom/base/Document.cpp
|
||||||
+++ b/dom/base/Document.cpp
|
+++ b/dom/base/Document.cpp
|
||||||
@@ -17084,6 +17084,7 @@ void Document::RemoveToplevelLoadingDocument(Document* aDoc) {
|
@@ -17828,7 +17828,8 @@ ColorScheme Document::DefaultColorScheme() const {
|
||||||
StylePrefersColorScheme Document::PrefersColorScheme(
|
}
|
||||||
IgnoreRFP aIgnoreRFP) const {
|
|
||||||
if (aIgnoreRFP == IgnoreRFP::No &&
|
ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
|
||||||
+ !StaticPrefs::privacy_override_rfp_for_color_scheme() &&
|
- if (ShouldResistFingerprinting() && aIgnoreRFP == IgnoreRFP::No) {
|
||||||
nsContentUtils::ShouldResistFingerprinting(this)) {
|
+ if (ShouldResistFingerprinting() && aIgnoreRFP == IgnoreRFP::No &&
|
||||||
return StylePrefersColorScheme::Light;
|
+ !StaticPrefs::privacy_override_rfp_for_color_scheme()) {
|
||||||
|
return ColorScheme::Light;
|
||||||
}
|
}
|
||||||
diff --git a/modules/libref/init/StaticPrefList.yaml b/modules/libref/init/StaticPrefList.yaml
|
|
||||||
index b4b2dc7..e65d43f 100644
|
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
|
||||||
|
index 7ec0341..c70b3af 100644
|
||||||
--- a/modules/libpref/init/StaticPrefList.yaml
|
--- a/modules/libpref/init/StaticPrefList.yaml
|
||||||
+++ b/modules/libpref/init/StaticPrefList.yaml
|
+++ b/modules/libpref/init/StaticPrefList.yaml
|
||||||
@@ -9863,6 +9863,12 @@
|
@@ -12156,6 +12156,12 @@
|
||||||
value: false
|
value: false
|
||||||
mirror: always
|
mirror: always
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue