[tbb-commits] [tor-browser] 02/48: Bug 41043: Hardcode the UI font on Linux

gitolite role git at cupani.torproject.org
Tue Sep 27 14:58:35 UTC 2022


This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2
in repository tor-browser.

commit cf65343370a8c68ace94db44427c02ff9ff47267
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Wed Jul 6 22:06:01 2022 +0200

    Bug 41043: Hardcode the UI font on Linux
    
    The mechanism to choose the UI font does not play well with our
    fontconfig configuration. As a result, the final criterion to choose
    the font for the UI was its version.
    
    Since we hardcode Arimo as a default sans-serif on preferences, we use
    it also for the UI. FontConfig will fall back to some other font for
    scripts Arimo does not cover as expected (we tested with Japanese).
---
 gfx/thebes/gfxFcPlatformFontList.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp
index ddd230be7e46..69286ae6dbe4 100644
--- a/gfx/thebes/gfxFcPlatformFontList.cpp
+++ b/gfx/thebes/gfxFcPlatformFontList.cpp
@@ -2033,10 +2033,12 @@ void gfxFcPlatformFontList::GetFontList(nsAtom* aLangGroup,
 FontFamily gfxFcPlatformFontList::GetDefaultFontForPlatform(
     nsPresContext* aPresContext, const gfxFontStyle* aStyle,
     nsAtom* aLanguage) {
-  // Get the default font by using a fake name to retrieve the first
-  // scalable font that fontconfig suggests for the given language.
+  // We hardcode Arimo also in preferences, and using the original code that
+  // tried to resolve a non-existing font did not play well with our fontconfig
+  // configuration. See
+  // https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41043
   PrefFontList* prefFonts =
-      FindGenericFamilies(aPresContext, "-moz-default"_ns,
+      FindGenericFamilies(aPresContext, "Arimo"_ns,
                           aLanguage ? aLanguage : nsGkAtoms::x_western);
   NS_ASSERTION(prefFonts, "null list of generic fonts");
   if (prefFonts && !prefFonts->IsEmpty()) {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the tbb-commits mailing list