Title: [206718] trunk/Source/WebCore
- Revision
- 206718
- Author
- [email protected]
- Date
- 2016-10-02 07:49:13 -0700 (Sun, 02 Oct 2016)
Log Message
Tried to fix the build after r206692.
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::cascadeToLastResortAndVariationsFontDescriptor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206717 => 206718)
--- trunk/Source/WebCore/ChangeLog 2016-10-02 14:25:08 UTC (rev 206717)
+++ trunk/Source/WebCore/ChangeLog 2016-10-02 14:49:13 UTC (rev 206718)
@@ -1,3 +1,10 @@
+2016-10-02 Dan Bernstein <[email protected]>
+
+ Tried to fix the build after r206692.
+
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::cascadeToLastResortAndVariationsFontDescriptor):
+
2016-10-02 Commit Queue <[email protected]>
Unreviewed, rolling out r206716.
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (206717 => 206718)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-10-02 14:25:08 UTC (rev 206717)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-10-02 14:49:13 UTC (rev 206718)
@@ -122,8 +122,8 @@
// 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
- CFDictionaryRef attributes = cascadeToLastResortAttributesDictionary();
auto variations = adoptCF(static_cast<CFDictionaryRef>(CTFontCopyAttribute(originalFont, kCTFontVariationAttribute)));
if (!variations)
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
