Title: [284272] trunk/Source/WTF
- Revision
- 284272
- Author
- [email protected]
- Date
- 2021-10-15 14:11:37 -0700 (Fri, 15 Oct 2021)
Log Message
Clean up font-related USE(...) macros
https://bugs.webkit.org/show_bug.cgi?id=231793
Reviewed by Wenson Hsieh.
IOS_FAMILY is true for tvOS and watchOS, so we should be using
(PLATFORM(IOS) || PLATFORM(MACCATALYST) instead. Also, the simulator
is not special here - it should get the same policy as the system it's
simulating.
* wtf/PlatformUse.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (284271 => 284272)
--- trunk/Source/WTF/ChangeLog 2021-10-15 21:09:12 UTC (rev 284271)
+++ trunk/Source/WTF/ChangeLog 2021-10-15 21:11:37 UTC (rev 284272)
@@ -1,5 +1,19 @@
2021-10-15 Myles C. Maxfield <[email protected]>
+ Clean up font-related USE(...) macros
+ https://bugs.webkit.org/show_bug.cgi?id=231793
+
+ Reviewed by Wenson Hsieh.
+
+ IOS_FAMILY is true for tvOS and watchOS, so we should be using
+ (PLATFORM(IOS) || PLATFORM(MACCATALYST) instead. Also, the simulator
+ is not special here - it should get the same policy as the system it's
+ simulating.
+
+ * wtf/PlatformUse.h:
+
+2021-10-15 Myles C. Maxfield <[email protected]>
+
[Cocoa] Design System UI fonts exist on MacCatalyst
https://bugs.webkit.org/show_bug.cgi?id=231792
<rdar://problem/84273929>
Modified: trunk/Source/WTF/wtf/PlatformUse.h (284271 => 284272)
--- trunk/Source/WTF/wtf/PlatformUse.h 2021-10-15 21:09:12 UTC (rev 284271)
+++ trunk/Source/WTF/wtf/PlatformUse.h 2021-10-15 21:11:37 UTC (rev 284272)
@@ -298,23 +298,23 @@
#endif
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) \
- || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000) \
- || (PLATFORM(WATCHOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __WATCH_OS_VERSION_MIN_REQUIRED < 80000) \
- || (PLATFORM(APPLETV) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __TV_OS_VERSION_MIN_REQUIRED < 150000)
+ || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000) \
+ || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED < 80000) \
+ || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 150000)
#define USE_CTFONTSHAPEGLYPHS_WORKAROUND 1
#endif
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) \
- || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000) \
- || (PLATFORM(WATCHOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __WATCH_OS_VERSION_MIN_REQUIRED < 80000) \
- || (PLATFORM(APPLETV) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __TV_OS_VERSION_MIN_REQUIRED < 150000)
+ || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000) \
+ || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED < 80000) \
+ || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 150000)
#define USE_NON_VARIABLE_SYSTEM_FONT 1
#endif
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) \
- || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000) \
- || (PLATFORM(WATCHOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __WATCH_OS_VERSION_MIN_REQUIRED >= 90000) \
- || (PLATFORM(APPLETV) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __TV_OS_VERSION_MIN_REQUIRED >= 160000)
+ || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000) \
+ || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 90000) \
+ || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 160000)
#define USE_CTFONTHASTABLE 1
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
