Commit 5c532016 authored by Jonathan Kew's avatar Jonathan Kew
Browse files

Bug 1862182 - Create a pref to allow font fallback for unassigned Unicode... 

Bug 1862182 - Create a pref to allow font fallback for unassigned Unicode codepoints. r=gfx-reviewers,lsalzman, a=dsmith

Differential Revision: https://phabricator.services.mozilla.com/D192451
parent 23f28ddb

gfx/thebes/gfxTextRun.cpp

+5 −5
Original line number Diff line number Diff line
@@ -3336,9 +3336,10 @@ already_AddRefed<gfxFont> gfxFontGroup::FindFontForChar( 
  // fallback has already noted a failure.

  FontVisibility level =

      mPresContext ? mPresContext->GetFontVisibility() : FontVisibility::User;

  if (gfxPlatformFontList::PlatformFontList()->SkipFontFallbackForChar(level,

                                                                       aCh) ||

      GetGeneralCategory(aCh) == HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED) {

  auto* pfl = gfxPlatformFontList::PlatformFontList();

  if (pfl->SkipFontFallbackForChar(level, aCh) ||

      (!StaticPrefs::gfx_font_rendering_fallback_unassigned_chars() &&

       GetGeneralCategory(aCh) == HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED)) {

    if (candidateFont) {

      *aMatchType = candidateMatchType;

    }
@@ -3348,8 +3349,7 @@ already_AddRefed<gfxFont> gfxFontGroup::FindFontForChar( 
  // 2. search pref fonts

  RefPtr<gfxFont> font = WhichPrefFontSupportsChar(aCh, aNextCh, presentation);

  if (font) {

    if (PrefersColor(presentation) &&

        gfxPlatformFontList::PlatformFontList()->EmojiPrefHasUserValue()) {

    if (PrefersColor(presentation) && pfl->EmojiPrefHasUserValue()) {

      // For emoji, always accept the font from preferences if it's explicitly

      // user-set, even if it isn't actually a color-emoji font, as some users

      // may want to set their emoji font preference to a monochrome font like

modules/libpref/init/StaticPrefList.yaml

+6 −0
Original line number Diff line number Diff line
@@ -6221,6 +6221,12 @@ 
  value: false

  mirror: always



# whether to do font fallback for codepoints with General Category = Unassigned

- name: gfx.font_rendering.fallback.unassigned_chars

  type: RelaxedAtomicBool

  value: false

  mirror: always



#ifdef MOZ_WIDGET_GTK

-   name: gfx.font_rendering.fontconfig.max_generic_substitutions

    type: RelaxedAtomicUint32