Title: [188877] trunk/Source/WebCore
- Revision
- 188877
- Author
- mmaxfi...@apple.com
- Date
- 2015-08-24 13:18:13 -0700 (Mon, 24 Aug 2015)
Log Message
Fix the build fixes in r188875 and r188874
Unreviewed.
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::FontCache::createFontPlatformData):
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::toNSFontTraits):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188876 => 188877)
--- trunk/Source/WebCore/ChangeLog 2015-08-24 19:52:42 UTC (rev 188876)
+++ trunk/Source/WebCore/ChangeLog 2015-08-24 20:18:13 UTC (rev 188877)
@@ -1,3 +1,14 @@
+2015-08-24 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Fix the build fixes in r188875 and r188874
+
+ Unreviewed.
+
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::FontCache::createFontPlatformData):
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::toNSFontTraits):
+
2015-08-24 Tim Horton <timothy_hor...@apple.com>
Try to fix the build.
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (188876 => 188877)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-08-24 19:52:42 UTC (rev 188876)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-08-24 20:18:13 UTC (rev 188877)
@@ -480,15 +480,10 @@
// Ignore the result because we want to use our own algorithm to actually find the font.
CFRelease(CTFontCreateWithName(family.string().createCFString().get(), size, nullptr));
-#if ENABLE(PLATFORM_FONT_LOOKUP)
- font = platformFontLookupWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.textRenderingMode(), size);
-#else
- font = platformFontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.textRenderingMode(), size);
-#endif
- if (!font)
- return nullptr;
+ font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.textRenderingMode(), size);
}
#endif
+
if (!font)
return nullptr;
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (188876 => 188877)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-08-24 19:52:42 UTC (rev 188876)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-08-24 20:18:13 UTC (rev 188877)
@@ -178,6 +178,16 @@
return FontWeight900;
}
+static NSFontTraitMask toNSFontTraits(CTFontSymbolicTraits traits)
+{
+ NSFontTraitMask result = 0;
+ if (traits & kCTFontBoldTrait)
+ result |= NSBoldFontMask;
+ if (traits & kCTFontItalicTrait)
+ result |= NSItalicFontMask;
+ return result;
+}
+
#endif // PLATFORM_FONT_LOOKUP
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
@@ -199,18 +209,6 @@
}
#endif
-#if !ENABLE(PLATFORM_FONT_LOOKUP)
-static NSFontTraitMask toNSFontTraits(CTFontSymbolicTraits traits)
-{
- NSFontTraitMask result = 0;
- if (traits & kCTFontBoldTrait)
- result |= NSBoldFontMask;
- if (traits & kCTFontItalicTrait)
- result |= NSItalicFontMask;
- return result;
-}
-#endif
-
RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontWeight weight, CTFontSymbolicTraits desiredTraits, float size)
{
if (equalIgnoringASCIICase(family, "-webkit-system-font")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
