Title: [218163] trunk/Source/WebCore
- Revision
- 218163
- Author
- mmaxfi...@apple.com
- Date
- 2017-06-12 20:14:21 -0700 (Mon, 12 Jun 2017)
Log Message
[iOS] [macOS] Stop soft-linking Core Text function in iOS 11 and macOS High Sierra
https://bugs.webkit.org/show_bug.cgi?id=173289
Reviewed by Lucas Forschler.
No new tests because there is no behavior change.
* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::platformFontWithFamilySpecialCase):
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::platformFontWithFamilySpecialCase):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (218162 => 218163)
--- trunk/Source/WebCore/ChangeLog 2017-06-13 03:10:24 UTC (rev 218162)
+++ trunk/Source/WebCore/ChangeLog 2017-06-13 03:14:21 UTC (rev 218163)
@@ -1,5 +1,19 @@
2017-06-12 Myles C. Maxfield <mmaxfi...@apple.com>
+ [iOS] [macOS] Stop soft-linking Core Text function in iOS 11 and macOS High Sierra
+ https://bugs.webkit.org/show_bug.cgi?id=173289
+
+ Reviewed by Lucas Forschler.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::platformFontWithFamilySpecialCase):
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::platformFontWithFamilySpecialCase):
+
+2017-06-12 Myles C. Maxfield <mmaxfi...@apple.com>
+
[Cocoa] Expand system-ui to include every item in the Core Text cascade list
https://bugs.webkit.org/show_bug.cgi?id=173043
<rdar://problem/21125708>
Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (218162 => 218163)
--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-06-13 03:10:24 UTC (rev 218162)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-06-13 03:14:21 UTC (rev 218163)
@@ -39,11 +39,6 @@
#import <wtf/RetainPtr.h>
#import <wtf/text/CString.h>
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
-SOFT_LINK_FRAMEWORK(CoreText);
-SOFT_LINK_MAY_FAIL(CoreText, CTFontDescriptorCreateLastResort, CTFontDescriptorRef, (), ());
-#endif
-
namespace WebCore {
bool requiresCustomFallbackFont(UChar32 character)
@@ -105,14 +100,13 @@
if (equalLettersIgnoringASCIICase(family, "lastresort")) {
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
- if (canLoadCTFontDescriptorCreateLastResort()) {
- static NeverDestroyed<RetainPtr<CTFontDescriptorRef>> lastResort = adoptCF(CTFontDescriptorCreateLastResort());
- return adoptCF(CTFontCreateWithFontDescriptor(lastResort.get().get(), size, nullptr));
- }
-#endif
+ static NeverDestroyed<RetainPtr<CTFontDescriptorRef>> lastResort = adoptCF(CTFontDescriptorCreateLastResort());
+ return adoptCF(CTFontCreateWithFontDescriptor(lastResort.get().get(), size, nullptr));
+#else
// LastResort is special, so it's important to look this exact string up, and not some case-folded version.
// We handle this here so any caching and case folding we do in our general text codepath is bypassed.
return adoptCF(CTFontCreateWithName(CFSTR("LastResort"), size, nullptr));
+#endif
}
return nullptr;
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (218162 => 218163)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-06-13 03:10:24 UTC (rev 218162)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-06-13 03:14:21 UTC (rev 218163)
@@ -50,11 +50,6 @@
#import "SoftLinking.h"
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
-SOFT_LINK_FRAMEWORK(CoreText);
-SOFT_LINK_MAY_FAIL(CoreText, CTFontDescriptorCreateLastResort, CTFontDescriptorRef, (), ());
-#endif
-
namespace WebCore {
#if PLATFORM(MAC)
@@ -87,14 +82,13 @@
if (equalLettersIgnoringASCIICase(family, "lastresort")) {
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- if (canLoadCTFontDescriptorCreateLastResort()) {
- static NeverDestroyed<RetainPtr<CTFontDescriptorRef>> lastResort = adoptCF(CTFontDescriptorCreateLastResort());
- return adoptCF(CTFontCreateWithFontDescriptor(lastResort.get().get(), size, nullptr));
- }
-#endif
+ static NeverDestroyed<RetainPtr<CTFontDescriptorRef>> lastResort = adoptCF(CTFontDescriptorCreateLastResort());
+ return adoptCF(CTFontCreateWithFontDescriptor(lastResort.get().get(), size, nullptr));
+#else
// LastResort is special, so it's important to look this exact string up, and not some case-folded version.
// We handle this here so any caching and case folding we do in our general text codepath is bypassed.
return adoptCF(CTFontCreateWithName(CFSTR("LastResort"), size, nullptr));
+#endif
}
return nullptr;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
