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
-
970ae0b1
by Pier Angelo Vendrame at 2023-04-17T21:38:40+02:00
2 changed files:
Changes:
... | ... | @@ -690,8 +690,6 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S |
690 | 690 | #endif
|
691 | 691 | |
692 | 692 | #ifdef XP_LINUX
|
693 | -pref("layout.css.font-visibility.resistFingerprinting", 3); // work around bug 41163
|
|
694 | - |
|
695 | 693 | // Arabic
|
696 | 694 | pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos");
|
697 | 695 | pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo");
|
... | ... | @@ -1869,17 +1869,19 @@ void gfxFcPlatformFontList::InitSharedFontListForPlatform() { |
1869 | 1869 | }
|
1870 | 1870 | };
|
1871 | 1871 | |
1872 | - // iterate over available fonts
|
|
1873 | - FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
|
|
1874 | - addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false);
|
|
1875 | - |
|
1876 | 1872 | #ifdef MOZ_BUNDLED_FONTS
|
1873 | + // Add bundled fonts before system fonts, to set correct visibility status
|
|
1874 | + // for any families that appear in both.
|
|
1877 | 1875 | if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) {
|
1878 | 1876 | FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication);
|
1879 | 1877 | addFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true);
|
1880 | 1878 | }
|
1881 | 1879 | #endif
|
1882 | 1880 | |
1881 | + // iterate over available fonts
|
|
1882 | + FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
|
|
1883 | + addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false);
|
|
1884 | + |
|
1883 | 1885 | mozilla::fontlist::FontList* list = SharedFontList();
|
1884 | 1886 | list->SetFamilyNames(families);
|
1885 | 1887 |