Bug 1342315 - Don't inadvertently ignore font feature settings when creating a new CTFont. r=jrmuizel

This commit is contained in:
Jonathan Kew 2017-02-24 23:05:42 +00:00
parent 257eeceb19
commit 2164f79e6e

View File

@ -563,7 +563,8 @@ gfxMacFont::CreateCTFontFromCGFontWithVariations(CGFontRef aCGFont,
ctFont = ::CTFontCreateWithGraphicsFont(aCGFont, aSize, nullptr, varDesc); ctFont = ::CTFontCreateWithGraphicsFont(aCGFont, aSize, nullptr, varDesc);
::CFRelease(varDesc); ::CFRelease(varDesc);
} else { } else {
ctFont = ::CTFontCreateWithGraphicsFont(aCGFont, aSize, nullptr, nullptr); ctFont = ::CTFontCreateWithGraphicsFont(aCGFont, aSize, nullptr,
aFontDesc);
} }
return ctFont; return ctFont;
} }