Commit 3e30bb9c authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by Richard Pospesel
Browse files

fixup! Bug 42377: Hidden fonts should obey the allow list. 

Revert "Bug 42377: Hidden fonts should obey the allow list."

This reverts commit 3488619a.
parent bec1f691

gfx/thebes/gfxPlatformFontList.cpp

+8 −1
Original line number Diff line number Diff line
@@ -401,6 +401,12 @@ void gfxPlatformFontList::ApplyWhitelist() { 
  AutoTArray<RefPtr<gfxFontFamily>, 128> accepted;

  bool whitelistedFontFound = false;

  for (const auto& entry : mFontFamilies) {

    if (entry.GetData()->IsHidden()) {

      // Hidden system fonts are exempt from whitelisting, but don't count

      // towards determining whether we "kept" any (user-visible) fonts

      accepted.AppendElement(entry.GetData());

      continue;

    }

    nsAutoCString fontFamilyName(entry.GetKey());

    ToLowerCase(fontFamilyName);

    if (familyNamesWhitelist.Contains(fontFamilyName)) {
@@ -436,7 +442,8 @@ void gfxPlatformFontList::ApplyWhitelist( 
  AutoTArray<fontlist::Family::InitData, 128> accepted;

  bool keptNonHidden = false;

  for (auto& f : aFamilies) {

    if (familyNamesWhitelist.Contains(f.mKey)) {

    if (f.mVisibility == FontVisibility::Hidden ||

        familyNamesWhitelist.Contains(f.mKey)) {

      accepted.AppendElement(f);

      if (f.mVisibility != FontVisibility::Hidden) {

        keptNonHidden = true;