REGRESSION (r247566): Leak of UICTFontDescriptor in WebCore::FontDatabase::InstalledFont::InstalledFont()

• Component: Text
• Status: RESOLVED FIXED

[David Kilzer (:ddkilzer)]

Leak of UICTFontDescriptor in WebCore::FontDatabase::InstalledFont::InstalledFont():

    struct InstalledFont {
        InstalledFont() = default;

        InstalledFont(CTFontDescriptorRef fontDescriptor, AllowUserInstalledFonts allowUserInstalledFonts)
            : fontDescriptor(fontDescriptor)
            , capabilities(capabilitiesForFontDescriptor(fontDescriptor))
        {
#if HAVE(CTFONTCREATEFORCHARACTERSWITHLANGUAGEANDOPTION)
            UNUSED_PARAM(allowUserInstalledFonts);
#else
            if (allowUserInstalledFonts != AllowUserInstalledFonts::No)
                return;
            auto attributes = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
            addAttributesForInstalledFonts(attributes.get(), allowUserInstalledFonts);
            this->fontDescriptor = CTFontDescriptorCreateCopyWithAttributes(fontDescriptor, attributes.get());  // LEAK of CTFontDescriptorRef.  Missing adoptCF().
#endif
        }

        RetainPtr<CTFontDescriptorRef> fontDescriptor;
        FontSelectionCapabilities capabilities;
    };

Regressed in:

Bug 199769: Make sure to set kCTFontFallbackOptionAttribute to kCTFontFallbackOptionSystem for system fonts
<https://bugs.webkit.org/show_bug.cgi?id=199769>
<https://trac.webkit.org/changeset/247566/webkit>

[David Kilzer (:ddkilzer)]

<rdar://problem/55464115>

[David Kilzer (:ddkilzer)]

Created attachment 379014 [details]
Patch v1

[Brent Fulgham]

Comment on attachment 379014 [details]
Patch v1

r=me

[WebKit Commit Bot]

Comment on attachment 379014 [details]
Patch v1

Clearing flags on attachment: 379014

Committed r250031: <https://trac.webkit.org/changeset/250031>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.