Title: [210598] trunk/Source/WebCore
- Revision
- 210598
- Author
- [email protected]
- Date
- 2017-01-11 13:46:43 -0800 (Wed, 11 Jan 2017)
Log Message
[Cocoa] Testing fix after r210597
https://bugs.webkit.org/show_bug.cgi?id=166672
Unreviewed.
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::preparePlatformFont):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (210597 => 210598)
--- trunk/Source/WebCore/ChangeLog 2017-01-11 21:40:12 UTC (rev 210597)
+++ trunk/Source/WebCore/ChangeLog 2017-01-11 21:46:43 UTC (rev 210598)
@@ -1,5 +1,15 @@
2017-01-11 Myles C. Maxfield <[email protected]>
+ [Cocoa] Testing fix after r210597
+ https://bugs.webkit.org/show_bug.cgi?id=166672
+
+ Unreviewed.
+
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::preparePlatformFont):
+
+2017-01-11 Myles C. Maxfield <[email protected]>
+
[Cocoa] Testing fix after r210591
https://bugs.webkit.org/show_bug.cgi?id=166672
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (210597 => 210598)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-01-11 21:40:12 UTC (rev 210597)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-01-11 21:46:43 UTC (rev 210598)
@@ -419,6 +419,8 @@
}
#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) && WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
static inline bool fontIsSystemFont(CTFontRef font)
{
if (CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(font)).get()))
@@ -426,6 +428,7 @@
auto name = adoptCF(CTFontCopyPostScriptName(font));
return CFStringGetLength(name.get()) > 0 && CFStringGetCharacterAtIndex(name.get(), 0) == '.';
}
+#endif
RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, TextRenderingMode textRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings& variantSettings, const FontVariationSettings& variations)
{
@@ -432,7 +435,6 @@
bool alwaysAddVariations = false;
// FIXME: Remove when <rdar://problem/29859207> is fixed
-#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)
auto defaultValues = defaultVariationValues(originalFont);
#if WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
