Title: [219056] trunk/Source/WebCore
- Revision
- 219056
- Author
- m...@apple.com
- Date
- 2017-07-01 21:40:34 -0700 (Sat, 01 Jul 2017)
Log Message
<rdar://problem/33096441> r219055 broke non-iOS builds.
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::lookupFallbackFont):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (219055 => 219056)
--- trunk/Source/WebCore/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
+++ trunk/Source/WebCore/ChangeLog 2017-07-02 04:40:34 UTC (rev 219056)
@@ -1,5 +1,12 @@
2017-07-01 Dan Bernstein <m...@apple.com>
+ <rdar://problem/33096441> r219055 broke non-iOS builds.
+
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::lookupFallbackFont):
+
+2017-07-01 Dan Bernstein <m...@apple.com>
+
[iOS] Remove code only needed when building for iOS 9.x
https://bugs.webkit.org/show_bug.cgi?id=174068
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (219055 => 219056)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-07-02 02:06:40 UTC (rev 219055)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-07-02 04:40:34 UTC (rev 219056)
@@ -1280,7 +1280,7 @@
ASSERT(length > 0);
RetainPtr<CFStringRef> localeString;
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if (PLATFORM(IOS) && TARGET_OS_IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
if (!locale.isNull())
localeString = locale.string().createCFString();
#else
@@ -1289,7 +1289,7 @@
CFIndex coveredLength = 0;
RetainPtr<CTFontRef> result;
-#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS))
+#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && TARGET_OS_IOS))
result = adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
#else
result = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
