[tor-commits] [tor-browser] 59/311: Bug 1752881 - Include our preferred emoji fonts in Common Fallbacks on Windows, so that they'll take precedence over random user-installed emoji fonts when no explicit font request applies. r=m_kato, a=RyanVM

[gitolite role]

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

pierov pushed a commit to branch geckoview-99.0.1-11.0-1
in repository tor-browser.

commit 059863438871d1e62e5e0616d43d86461d59be62
Author: Jonathan Kew <jkew at mozilla.com>
AuthorDate: Wed Feb 2 13:40:58 2022 +0000

    Bug 1752881 - Include our preferred emoji fonts in Common Fallbacks on Windows, so that they'll take precedence over random user-installed emoji fonts when no explicit font request applies. r=m_kato, a=RyanVM
    
    Differential Revision: https://phabricator.services.mozilla.com/D137510
---
 gfx/thebes/gfxWindowsPlatform.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index 5fd9b433e2931..df9991bbed495 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -888,6 +888,14 @@ void gfxWindowsPlatform::GetCommonFallbackFonts(
   // Arial Unicode MS has lots of glyphs for obscure characters,
   // use it as a last resort
   aFontList.AppendElement(kFontArialUnicodeMS);
+
+  // If we didn't begin with the color-emoji fonts, include them here
+  // so that they'll be preferred over user-installed (and possibly
+  // broken) fonts in the global fallback path.
+  if (!PrefersColor(aPresentation)) {
+    aFontList.AppendElement(kFontSegoeUIEmoji);
+    aFontList.AppendElement(kFontTwemojiMozilla);
+  }
 }
 
 bool gfxWindowsPlatform::DidRenderingDeviceReset(

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