Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor 
Project / Applications / Tor Browser


Commits:
406293f5 by Pier Angelo Vendrame at 2024-03-06T11:30:40+01:00
fixup! Firefox preference overrides.

Bug 42377: Hidden fonts should obey the allow list.

Remove .Helvetica Neue DeskInterface from the allow list.
This font might not be actually available, and in any case fonts
starting with period will not be displayed by the browser.

- - - - -
a8c62f72 by Pier Angelo Vendrame at 2024-03-06T17:00:49+01:00
Bug 42377: Hidden fonts should obey the allow list.

Hidden font families were automatically added to the
`font.system.whitelist`, which is a behavior that conflicts with our
font picking.

- - - - -


2 changed files:

- browser/app/profile/001-base-profile.js
- gfx/thebes/gfxPlatformFontList.cpp


Changes:

=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -656,7 +656,7 @@ pref("toolkit.winRegisterApplicationRestart", false);
 pref("gfx.bundled-fonts.activate", 1);
 
 #ifdef XP_MACOSX
-pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, 
Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica 
Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, 
Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, 
Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto 
Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto 
Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans 
Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto 
Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto 
Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto 
Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans 
Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans 
Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans 
Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, 
Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans 
Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, 
Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto 
Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans 
Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh 
Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans 
Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto 
Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, 
Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans 
Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai 
Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, 
Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, 
Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, 
Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, 
Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto 
Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, 
Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif 
Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto 
Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto 
Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, 
Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto 
Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto 
Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
+pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, 
Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino 
Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang 
SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New 
Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans 
Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans 
Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, 
Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto 
Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto 
Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, 
Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans 
Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah 
Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, 
Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto 
Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei 
Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans 
Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, 
Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto 
Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, 
Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, 
Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora 
Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto 
Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto 
Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto 
Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans 
Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, 
Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, 
Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto 
Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh 
Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans 
Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, 
Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif 
Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif 
Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto 
Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto 
Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto 
Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
 
 // Armenian
 pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New 
Roman");


=====================================
gfx/thebes/gfxPlatformFontList.cpp
=====================================
@@ -401,12 +401,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)) {
@@ -442,8 +436,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;



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a851484370d22f34922f5f5b20af3fd0f107677e...a8c62f72b047652f7f2e3ab3679bd21fd0675b2c

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a851484370d22f34922f5f5b20af3fd0f107677e...a8c62f72b047652f7f2e3ab3679bd21fd0675b2c
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tbb-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-commits

Reply via email to