Title: [188874] trunk/Source/WebCore
- Revision
- 188874
- Author
- [email protected]
- Date
- 2015-08-24 11:50:09 -0700 (Mon, 24 Aug 2015)
Log Message
Fix the build.
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::toNSFontWeight):
(WebCore::toNSFontTraits):
(WebCore::platformFontWithFamilySpecialCase):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188873 => 188874)
--- trunk/Source/WebCore/ChangeLog 2015-08-24 18:48:51 UTC (rev 188873)
+++ trunk/Source/WebCore/ChangeLog 2015-08-24 18:50:09 UTC (rev 188874)
@@ -1,3 +1,12 @@
+2015-08-24 Tim Horton <[email protected]>
+
+ Fix the build.
+
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::toNSFontWeight):
+ (WebCore::toNSFontTraits):
+ (WebCore::platformFontWithFamilySpecialCase):
+
2015-08-24 Myles C. Maxfield <[email protected]>
Use Optionals in RenderBox height computations
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (188873 => 188874)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-08-24 18:48:51 UTC (rev 188873)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-08-24 18:50:09 UTC (rev 188874)
@@ -199,6 +199,7 @@
}
#endif
+#if !ENABLE(PLATFORM_FONT_LOOKUP)
static NSFontTraitMask toNSFontTraits(CTFontSymbolicTraits traits)
{
NSFontTraitMask result = 0;
@@ -208,6 +209,7 @@
result |= NSItalicFontMask;
return result;
}
+#endif
RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontWeight weight, CTFontSymbolicTraits desiredTraits, float size)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
