Diff
Modified: trunk/LayoutTests/ChangeLog (206718 => 206719)
--- trunk/LayoutTests/ChangeLog 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/ChangeLog 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,3 +1,18 @@
+2016-10-02 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r206692 and r206718.
+
+ Seems to have caused >200 failures on Sierra
+
+ Reverted changesets:
+
+ "Implement rendering of font-variation-settings"
+ https://bugs.webkit.org/show_bug.cgi?id=162782
+ http://trac.webkit.org/changeset/206692
+
+ "Tried to fix the build after r206692."
+ http://trac.webkit.org/changeset/206718
+
2016-10-01 Simon Fraser <[email protected]>
Support transitions/animations of background-position with right/bottom-relative values
Deleted: trunk/LayoutTests/fast/text/variations/duplicate-expected.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/duplicate-expected.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/duplicate-expected.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: 'Skia'; font-variation-settings: 'wght' 3;">Test passes if this text has a weight of 3.</div>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/text/variations/duplicate.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/duplicate.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/duplicate.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: 'Skia'; font-variation-settings: 'wght' 2, 'wght' 3;">Test passes if this text has a weight of 3.</div>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: 'Skia';">Test passes if this text is bold.</div>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/text/variations/exist.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/exist.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/exist.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: '-apple-system'; font-variation-settings: 'wght' 1.8;">Test passes if this text is bold.</div>
-</body>
-</html>
Modified: trunk/LayoutTests/fast/text/variations/getComputedStyle.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/getComputedStyle.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/getComputedStyle.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -29,4 +29,4 @@
</script>
<script src=""
</body>
-</html>
\ No newline at end of file
+</html>
Deleted: trunk/LayoutTests/fast/text/variations/inheritance-expected.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/inheritance-expected.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/inheritance-expected.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: 'Skia'; font-variation-settings: 'wght' 2;">Test passes if this text is bold.</div>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/text/variations/inheritance.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/inheritance.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/inheritance.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: 'Skia'; font-variation-settings: 'wght' 2;"><div>Test passes if this text is bold.</div></div>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/text/variations/order-expected.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/order-expected.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/order-expected.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: 'Skia'; font-variation-settings: 'wdth' 1.2, 'wght' 2;">Test passes if this text has a weight of 3.</div>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/text/variations/order.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/order.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/order.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: 'Skia'; font-variation-settings: 'wght' 2, 'wdth' 1.2;">Test passes if this text has a weight of 3.</div>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/text/variations/outofbounds-expected.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/outofbounds-expected.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/outofbounds-expected.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: 'Skia';">Test passes if this text is not bold.</div>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/text/variations/outofbounds.html (206718 => 206719)
--- trunk/LayoutTests/fast/text/variations/outofbounds.html 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/LayoutTests/fast/text/variations/outofbounds.html 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
-</head>
-<body>
-<div style="font-family: 'Skia'; font-variation-settings: 'wght' 27;">Test passes if this text is not bold.</div>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (206718 => 206719)
--- trunk/Source/WebCore/ChangeLog 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/Source/WebCore/ChangeLog 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1,3 +1,18 @@
+2016-10-02 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r206692 and r206718.
+
+ Seems to have caused >200 failures on Sierra
+
+ Reverted changesets:
+
+ "Implement rendering of font-variation-settings"
+ https://bugs.webkit.org/show_bug.cgi?id=162782
+ http://trac.webkit.org/changeset/206692
+
+ "Tried to fix the build after r206692."
+ http://trac.webkit.org/changeset/206718
+
2016-10-02 Dan Bernstein <[email protected]>
Tried to fix the build after r206692.
Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (206718 => 206719)
--- trunk/Source/WebCore/platform/graphics/FontCache.h 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2016-10-02 18:19:05 UTC (rev 206719)
@@ -259,7 +259,7 @@
bool needsSyntheticOblique;
};
-RetainPtr<CTFontRef> preparePlatformFont(CTFontRef, TextRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings&, const FontVariationSettings&);
+RetainPtr<CTFontRef> preparePlatformFont(CTFontRef, TextRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings&);
FontWeight fontWeightFromCoreText(CGFloat weight);
uint16_t toCoreTextFontWeight(FontWeight);
bool isFontWeightBold(FontWeight);
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (206718 => 206719)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-10-02 18:19:05 UTC (rev 206719)
@@ -143,7 +143,6 @@
}
typedef HashMap<FontTag, int, FourCharacterTagHash, FourCharacterTagHashTraits> FeaturesMap;
-typedef HashMap<FontTag, float, FourCharacterTagHash, FourCharacterTagHashTraits> VariationsMap;
static FeaturesMap computeFeatureSettingsFromVariants(const FontVariantSettings& variantSettings)
{
@@ -361,9 +360,9 @@
return result;
}
-RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, TextRenderingMode textRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings& variantSettings, const FontVariationSettings& variations)
+RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, TextRenderingMode textRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings& variantSettings)
{
- if (!originalFont || (!features.size() && variations.isEmpty() && (textRenderingMode == AutoTextRendering) && variantSettings.isAllNormal()
+ if (!originalFont || (!features.size() && (textRenderingMode == AutoTextRendering) && variantSettings.isAllNormal()
&& (!fontFaceFeatures || !fontFaceFeatures->size()) && (!fontFaceVariantSettings || fontFaceVariantSettings->isAllNormal())))
return originalFont;
@@ -399,12 +398,8 @@
for (auto& newFeature : features)
featuresToBeApplied.set(newFeature.tag(), newFeature.value());
- VariationsMap variationsToBeApplied;
- for (auto& newVariation : variations)
- variationsToBeApplied.set(newVariation.tag(), newVariation.value());
-
RetainPtr<CFMutableDictionaryRef> attributes = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
- if (!featuresToBeApplied.isEmpty()) {
+ if (featuresToBeApplied.size()) {
RetainPtr<CFMutableArrayRef> featureArray = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, features.size(), &kCFTypeArrayCallBacks));
for (auto& p : featuresToBeApplied) {
auto feature = FontFeature(p.key, p.value);
@@ -413,18 +408,6 @@
}
CFDictionaryAddValue(attributes.get(), kCTFontFeatureSettingsAttribute, featureArray.get());
}
-
- if (!variationsToBeApplied.isEmpty()) {
- auto variationDictionary = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
- for (auto& p : variationsToBeApplied) {
- long long bitwiseTag = p.key[0] << 24 | p.key[1] << 16 | p.key[2] << 8 | p.key[3];
- auto tagNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberLongLongType, &bitwiseTag));
- auto valueNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberFloatType, &p.value));
- CFDictionarySetValue(variationDictionary.get(), tagNumber.get(), valueNumber.get());
- }
- CFDictionaryAddValue(attributes.get(), kCTFontVariationAttribute, variationDictionary.get());
- }
-
if (textRenderingMode == OptimizeLegibility) {
CGFloat size = CTFontGetSize(originalFont);
RetainPtr<CFNumberRef> sizeNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberCGFloatType, &size));
@@ -693,7 +676,7 @@
}
#endif
-static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, CTFontSymbolicTraits desiredTraits, FontWeight weight, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, const FontVariationSettings& variationSettings, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const TextRenderingMode& textRenderingMode, float size)
+static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, CTFontSymbolicTraits desiredTraits, FontWeight weight, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const TextRenderingMode& textRenderingMode, float size)
{
if (family.isEmpty())
return nullptr;
@@ -706,7 +689,7 @@
foundFont = platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
#endif
}
- return preparePlatformFont(foundFont.get(), textRenderingMode, fontFaceFeatures, fontFaceVariantSettings, featureSettings, variantSettings, variationSettings);
+ return preparePlatformFont(foundFont.get(), textRenderingMode, fontFaceFeatures, fontFaceVariantSettings, featureSettings, variantSettings);
}
#if PLATFORM(MAC)
@@ -746,7 +729,7 @@
CTFontSymbolicTraits traits = computeTraits(fontDescription);
float size = fontDescription.computedPixelSize();
- RetainPtr<CTFontRef> font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
+ RetainPtr<CTFontRef> font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
#if PLATFORM(MAC)
if (!font) {
@@ -757,7 +740,7 @@
// Ignore the result because we want to use our own algorithm to actually find the font.
autoActivateFont(family.string(), size);
- font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
+ font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
}
#endif
@@ -801,7 +784,7 @@
const FontPlatformData& platformData = originalFontData->platformData();
RetainPtr<CTFontRef> result = platformLookupFallbackFont(platformData.font(), description.weight(), description.locale(), characters, length);
- result = preparePlatformFont(result.get(), description.textRenderingMode(), nullptr, nullptr, description.featureSettings(), description.variantSettings(), description.variationSettings());
+ result = preparePlatformFont(result.get(), description.textRenderingMode(), nullptr, nullptr, description.featureSettings(), description.variantSettings());
if (!result)
return lastResortFallbackFont(description);
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (206718 => 206719)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-10-02 18:19:05 UTC (rev 206719)
@@ -99,11 +99,11 @@
return TextSpacingProportional;
}
-static CFDictionaryRef cascadeToLastResortAttributesDictionary()
+static CTFontDescriptorRef cascadeToLastResortFontDescriptor()
{
- static CFDictionaryRef attributes = nullptr;
- if (attributes)
- return attributes;
+ static CTFontDescriptorRef descriptor;
+ if (descriptor)
+ return descriptor;
RetainPtr<CTFontDescriptorRef> lastResort = adoptCF(CTFontDescriptorCreateWithNameAndSize(CFSTR("LastResort"), 0));
@@ -112,37 +112,11 @@
const void* keys[] = { kCTFontCascadeListAttribute };
const void* values[] = { array.get() };
- attributes = CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+ RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
- return attributes;
-}
+ descriptor = CTFontDescriptorCreateWithAttributes(attributes.get());
-static RetainPtr<CTFontDescriptorRef> cascadeToLastResortAndVariationsFontDescriptor(CTFontRef originalFont)
-{
-// FIXME: Remove this when <rdar://problem/28449441> is fixed.
-#define WORKAROUND_CORETEXT_VARIATIONS_WITH_FALLBACK_LIST_BUG ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000))
-
- CFDictionaryRef attributes = cascadeToLastResortAttributesDictionary();
-#if WORKAROUND_CORETEXT_VARIATIONS_WITH_FALLBACK_LIST_BUG
- auto variations = adoptCF(static_cast<CFDictionaryRef>(CTFontCopyAttribute(originalFont, kCTFontVariationAttribute)));
- if (!variations)
-#endif
- {
- UNUSED_PARAM(originalFont);
-
- static CTFontDescriptorRef descriptor = nullptr;
- if (descriptor)
- return descriptor;
-
- descriptor = CTFontDescriptorCreateWithAttributes(attributes);
- return descriptor;
- }
-#if WORKAROUND_CORETEXT_VARIATIONS_WITH_FALLBACK_LIST_BUG
- auto mutableAttributes = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 2, attributes));
- CFDictionaryAddValue(mutableAttributes.get(), kCTFontVariationAttribute, variations.get());
- return adoptCF(CTFontDescriptorCreateWithAttributes(mutableAttributes.get()));
-#endif
-#undef WORKAROUND_CORETEXT_VARIATIONS_WITH_FALLBACK_LIST_BUG
+ return descriptor;
}
CTFontRef FontPlatformData::ctFont() const
@@ -154,7 +128,7 @@
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
ASSERT(m_cgFont);
#endif
- m_ctFont = adoptCF(CTFontCreateCopyWithAttributes(m_font.get(), m_size, 0, cascadeToLastResortAndVariationsFontDescriptor(m_font.get()).get()));
+ m_ctFont = adoptCF(CTFontCreateCopyWithAttributes(m_font.get(), m_size, 0, cascadeToLastResortFontDescriptor()));
if (m_widthVariant != RegularWidth) {
int featureTypeValue = kTextSpacingType;
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (206718 => 206719)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2016-10-02 18:19:05 UTC (rev 206719)
@@ -40,7 +40,7 @@
FontOrientation orientation = fontDescription.orientation();
FontWidthVariant widthVariant = fontDescription.widthVariant();
RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithFontDescriptor(m_fontDescriptor.get(), size, nullptr));
- font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), &fontFaceFeatures, &fontFaceVariantSettings, fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings());
+ font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), &fontFaceFeatures, &fontFaceVariantSettings, fontDescription.featureSettings(), fontDescription.variantSettings());
ASSERT(font);
return FontPlatformData(font.get(), size, bold, italic, orientation, widthVariant, fontDescription.textRenderingMode());
}
Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (206718 => 206719)
--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-10-02 14:49:13 UTC (rev 206718)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-10-02 18:19:05 UTC (rev 206719)
@@ -1278,7 +1278,7 @@
ASSERT(fontDescriptor);
RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), 0, nullptr));
- font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), nullptr, nullptr, fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings());
+ font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), nullptr, nullptr, fontDescription.featureSettings(), fontDescription.variantSettings());
fontDescription.setIsAbsoluteSize(true);
fontDescription.setOneFamily(textStyle);
fontDescription.setSpecifiedSize(CTFontGetSize(font.get()));
