Title: [187709] trunk/Source/WebCore
- Revision
- 187709
- Author
- mmaxfi...@apple.com
- Date
- 2015-07-31 21:27:49 -0700 (Fri, 31 Jul 2015)
Log Message
Fix the build
Unreviewed.
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::lookupCTFont):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187708 => 187709)
--- trunk/Source/WebCore/ChangeLog 2015-08-01 04:15:48 UTC (rev 187708)
+++ trunk/Source/WebCore/ChangeLog 2015-08-01 04:27:49 UTC (rev 187709)
@@ -1,5 +1,14 @@
2015-07-31 Myles C. Maxfield <mmaxfi...@apple.com>
+ Fix the build
+
+ Unreviewed.
+
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::lookupCTFont):
+
+2015-07-31 Myles C. Maxfield <mmaxfi...@apple.com>
+
[OS X] Migrate to CTFontCreateForCharactersWithLanguage from [NSFont findFontLike:forString:withRange:inLanguage]
https://bugs.webkit.org/show_bug.cgi?id=147483
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (187708 => 187709)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-08-01 04:15:48 UTC (rev 187708)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-08-01 04:27:49 UTC (rev 187709)
@@ -474,7 +474,9 @@
static inline RetainPtr<CTFontRef> lookupCTFont(CTFontRef font, float fontSize, const UChar* characters, unsigned length)
{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED != 1090
+ UNUSED_PARAM(fontSize);
+#else
if (!font) {
font = reinterpret_cast<CTFontRef>([NSFont userFontOfSize:fontSize]);
bool acceptable = true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
