mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-15 14:25:52 +00:00
Bug 1342315 - Don't inadvertently ignore font feature settings when creating a new CTFont. r=jrmuizel
This commit is contained in:
parent
257eeceb19
commit
2164f79e6e
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user