[tbb-commits] [Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] 2 commits: Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when...

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch base-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser


Commits:
b0a97d20 by Jonathan Kew at 2023-04-17T21:38:31+02:00
Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when they 'shadow' system-installed families. r=gfx-reviewers,lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D175350
- - - - -
970ae0b1 by Pier Angelo Vendrame at 2023-04-17T21:38:40+02:00
fixup! Firefox preference overrides.

Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP

Removed the workaround now that we have the upstream fix.

- - - - -


2 changed files:

- browser/app/profile/001-base-profile.js
- gfx/thebes/gfxFcPlatformFontList.cpp


Changes:

=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -690,8 +690,6 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S
 #endif
 
 #ifdef XP_LINUX
-pref("layout.css.font-visibility.resistFingerprinting", 3); // work around bug 41163
-
 // Arabic
 pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos");
 pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo");


=====================================
gfx/thebes/gfxFcPlatformFontList.cpp
=====================================
@@ -1869,17 +1869,19 @@ void gfxFcPlatformFontList::InitSharedFontListForPlatform() {
     }
   };
 
-  // iterate over available fonts
-  FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
-  addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false);
-
 #ifdef MOZ_BUNDLED_FONTS
+  // Add bundled fonts before system fonts, to set correct visibility status
+  // for any families that appear in both.
   if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) {
     FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication);
     addFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true);
   }
 #endif
 
+  // iterate over available fonts
+  FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
+  addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false);
+
   mozilla::fontlist::FontList* list = SharedFontList();
   list->SetFamilyNames(families);
 



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/22054938a3c6181b20e57d5e462a2359dead63a7...970ae0b1f280ae01ae1ab3fd38fd131fe0bc7e42

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/22054938a3c6181b20e57d5e462a2359dead63a7...970ae0b1f280ae01ae1ab3fd38fd131fe0bc7e42
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20230417/56a4226a/attachment-0001.htm>