Title: [213507] trunk/Source/WebCore
- Revision
- 213507
- Author
- mmaxfi...@apple.com
- Date
- 2017-03-07 00:47:03 -0800 (Tue, 07 Mar 2017)
Log Message
Test fix after r213505
https://bugs.webkit.org/show_bug.cgi?id=169267
Unreviewed.
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::preparePlatformFont):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (213506 => 213507)
--- trunk/Source/WebCore/ChangeLog 2017-03-07 07:38:41 UTC (rev 213506)
+++ trunk/Source/WebCore/ChangeLog 2017-03-07 08:47:03 UTC (rev 213507)
@@ -1,3 +1,13 @@
+2017-03-07 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Test fix after r213505
+ https://bugs.webkit.org/show_bug.cgi?id=169267
+
+ Unreviewed.
+
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::preparePlatformFont):
+
2017-03-06 Myles C. Maxfield <mmaxfi...@apple.com>
Apply well-known-axis variation values at the right time in preparePlatformFont()
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (213506 => 213507)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-03-07 07:38:41 UTC (rev 213506)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-03-07 08:47:03 UTC (rev 213507)
@@ -420,9 +420,7 @@
return result;
}
#endif
-
-#define WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000))
-#if ENABLE(VARIATION_FONTS) && (PLATFORM(IOS) || WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG)
+#if ENABLE(VARIATION_FONTS)
static inline bool fontIsSystemFont(CTFontRef font)
{
if (CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(font)).get()))
@@ -505,10 +503,8 @@
applyVariationValue(tag, valueToApply, isDefaultValue);
};
-#if PLATFORM(IOS)
// The system font is somewhat magical. Don't mess with its variations.
if (!fontIsSystemFont(originalFont))
-#endif
{
applyVariation({{'w', 'g', 'h', 't'}}, static_cast<float>(fontSelectionRequest.weight));
applyVariation({{'w', 'd', 't', 'h'}}, static_cast<float>(fontSelectionRequest.width));
@@ -517,6 +513,7 @@
for (auto& newVariation : variations)
applyVariation(newVariation.tag(), newVariation.value());
+#define WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000))
#if WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
if (!fontIsSystemFont(originalFont)) {
for (auto& defaultValue : defaultValues) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
