Skip to content
Snippets Groups Projects
Verified Commit c15b5499 authored by Tom Ritter's avatar Tom Ritter Committed by Pier Angelo Vendrame
Browse files

Bug 1885258: Hidden fonts should obey the allow list r=jfkthame

parent 46e0574f
Branches
No related tags found
1 merge request!1037Bug 42614: Rebased onto 115.12
......@@ -402,12 +402,6 @@ 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)) {
......@@ -443,8 +437,7 @@ void gfxPlatformFontList::ApplyWhitelist(
AutoTArray<fontlist::Family::InitData, 128> accepted;
bool keptNonHidden = false;
for (auto& f : aFamilies) {
if (f.mVisibility == FontVisibility::Hidden ||
familyNamesWhitelist.Contains(f.mKey)) {
if (familyNamesWhitelist.Contains(f.mKey)) {
accepted.AppendElement(f);
if (f.mVisibility != FontVisibility::Hidden) {
keptNonHidden = true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment