[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] Bug 2041887 - Don't pass an empty filename to fontconfig. a=RyanVM

Title: GitLab

Pier Angelo Vendrame pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

  • f5cbdc8b
    by Jonathan Kew at 2026-06-11T08:53:41+02:00 
    Bug 2041887 - Don't pass an empty filename to fontconfig.  a=RyanVM

Original Revision: https://phabricator.services.mozilla.com/D302360

Differential Revision: https://phabricator.services.mozilla.com/D302589

2 changed files:

Changes:

  • gfx/thebes/gfxFcPlatformFontList.cpp
    ... ... @@ -294,7 +294,7 @@ gfxFontEntry* gfxFontconfigFontEntry::Clone() const {
    294 294 
     static already_AddRefed<FcPattern> CreatePatternForFace(FT_Face aFace) {
    295 295 
       // Use fontconfig to fill out the pattern from the FTFace.
    296 296 
       // The "file" argument cannot be nullptr (in fontconfig-2.6.0 at
    297 
    -  // least). The dummy file passed here is removed below.
    297 
    +  // least). The dummy filename passed here is removed below.
    298 298 
       //
    299 299 
       // When fontconfig scans the system fonts, FcConfigGetBlanks(nullptr)
    300 300 
       // is passed as the "blanks" argument, which provides that unexpectedly
    ... ... @@ -302,8 +302,8 @@ static already_AddRefed<FcPattern> CreatePatternForFace(FT_Face aFace) {
    302 302 
       // "blanks", effectively assuming that, if the font has a blank glyph,
    303 303 
       // then the author intends any associated character to be rendered
    304 304 
       // blank.
    305 
    -  RefPtr<FcPattern> pattern =
    306 
    -      dont_AddRef(FcFreeTypeQueryFace(aFace, ToFcChar8Ptr(""), 0, nullptr));
    305 
    +  RefPtr<FcPattern> pattern = dont_AddRef(
    306 
    +      FcFreeTypeQueryFace(aFace, ToFcChar8Ptr("(webfont)"), 0, nullptr));
    307 307 
       // given that we have a FT_Face, not really sure this is possible...
    308 308 
       if (!pattern) {
    309 309 
         pattern = dont_AddRef(FcPatternCreate());

  • layout/reftests/text-svgglyphs/reftest.list
    ... ... @@ -30,7 +30,7 @@ skip-if(!Android&&isDebugBuild) == svg-glyph-transform.svg svg-glyph-transform-r
    30 30 
     skip-if(!Android&&isDebugBuild) == svg-glyph-extents.html svg-glyph-extents-ref.html
    31 31 
     skip-if(!Android&&isDebugBuild) == svg-glyph-compressed.html svg-glyph-compressed-ref.html
    32 32
    33 
    -skip-if(!Android&&isDebugBuild) fuzzy(46-77,300-600) == bug1320197-1.html bug1320197-1-ref.html
    33 
    +skip-if(!Android&&isDebugBuild) fuzzy(46-128,300-600) == bug1320197-1.html bug1320197-1-ref.html
    34 34 
     skip-if(!Android&&isDebugBuild) fuzzy-if(winWidget,0-137,0-198) fuzzy-if(Android,0-81,0-144) == svg-in-ot-bitmap-1.html svg-in-ot-bitmap-1-ref.html
    35 35
    36 36 
     defaults

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f5cbdc8b5be457d4c362439d1c38730776c49c8d at 1781163439 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx