Title: [188734] trunk/Source/WebCore
- Revision
- 188734
- Author
- [email protected]
- Date
- 2015-08-20 18:46:36 -0700 (Thu, 20 Aug 2015)
Log Message
Fix the iOS build after r188726
https://bugs.webkit.org/show_bug.cgi?id=148278
Unreviewed.
* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::FontCache::systemFallbackForCharacters):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188733 => 188734)
--- trunk/Source/WebCore/ChangeLog 2015-08-21 01:42:21 UTC (rev 188733)
+++ trunk/Source/WebCore/ChangeLog 2015-08-21 01:46:36 UTC (rev 188734)
@@ -1,6 +1,17 @@
2015-08-20 Myles C. Maxfield <[email protected]>
+ Fix the iOS build after r188726
+ https://bugs.webkit.org/show_bug.cgi?id=148278
+
+ Unreviewed.
+
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::FontCache::systemFallbackForCharacters):
+
+2015-08-20 Myles C. Maxfield <[email protected]>
+
Cleanup after r188726
+ https://bugs.webkit.org/show_bug.cgi?id=148278
Unreviewed.
Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (188733 => 188734)
--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-08-21 01:42:21 UTC (rev 188733)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-08-21 01:46:36 UTC (rev 188734)
@@ -108,7 +108,12 @@
return getSystemFontFallbackForCharacters(description, originalFontData, characters, length);
}
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage(originalFontData->getCTFont(), characters, length, nullptr, nullptr));
+#else
+ RetainPtr<CTFontRef> fallbackFont = adoptCF(CTFontCreateForCharactersWithLanguage(originalFontData->getCTFont(), characters, length, nullptr, nullptr));
+ RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCopyFontDescriptor(fallbackFont.get()));
+#endif
if (auto foundFontName = adoptCF(static_cast<CFStringRef>(CTFontDescriptorCopyAttribute(fallbackFontDescriptor.get(), kCTFontNameAttribute)))) {
if (c >= 0x0600 && c <= 0x06ff) { // Arabic
auto familyName = adoptCF(static_cast<CFStringRef>(CTFontDescriptorCopyAttribute(fallbackFontDescriptor.get(), kCTFontFamilyNameAttribute)));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
