[webkit-changes] [255073] trunk/Source/WTF

Fri, 24 Jan 2020 08:33:06 -0800

Title: [255073] trunk/Source/WTF
Revision
255073
Author
[email protected]
Date
2020-01-24 08:32:26 -0800 (Fri, 24 Jan 2020)

Log Message

WTF: Remove old iOS version macros
https://bugs.webkit.org/show_bug.cgi?id=206634
<rdar://problem/58818561>

Reviewed by Darin Adler.

* wtf/PlatformEnable.h: Remove iOS 12 version macro.
* wtf/PlatformHave.h: Ditto.
* wtf/PlatformUse.h: Ditto.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (255072 => 255073)


--- trunk/Source/WTF/ChangeLog	2020-01-24 15:58:45 UTC (rev 255072)
+++ trunk/Source/WTF/ChangeLog	2020-01-24 16:32:26 UTC (rev 255073)
@@ -1,3 +1,15 @@
+2020-01-24  Jonathan Bedard  <[email protected]>
+
+        WTF: Remove old iOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=206634
+        <rdar://problem/58818561>
+
+        Reviewed by Darin Adler.
+
+        * wtf/PlatformEnable.h: Remove iOS 12 version macro.
+        * wtf/PlatformHave.h: Ditto.
+        * wtf/PlatformUse.h: Ditto.
+
 2020-01-22  Darin Adler  <[email protected]>
 
         Remove some unneeded definitions from Platform.h family headers

Modified: trunk/Source/WTF/wtf/PlatformEnable.h (255072 => 255073)


--- trunk/Source/WTF/wtf/PlatformEnable.h	2020-01-24 15:58:45 UTC (rev 255072)
+++ trunk/Source/WTF/wtf/PlatformEnable.h	2020-01-24 16:32:26 UTC (rev 255073)
@@ -200,21 +200,17 @@
 #define ENABLE_DOWNLOAD_ATTRIBUTE 1
 #endif
 
-#if !defined(ENABLE_WKPDFVIEW)
-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
+#if !defined(ENABLE_WKPDFVIEW) && PLATFORM(IOS)
 #define ENABLE_WKPDFVIEW 1
 #endif
-#endif
 
 #if !defined(ENABLE_MEDIA_SOURCE)
 #define ENABLE_MEDIA_SOURCE 0
 #endif
 
-#if !defined(ENABLE_PREVIEW_CONVERTER)
-#if PLATFORM(IOS)
+#if !defined(ENABLE_PREVIEW_CONVERTER) && PLATFORM(IOS)
 #define ENABLE_PREVIEW_CONVERTER 1
 #endif
-#endif
 
 #if !defined(ENABLE_META_VIEWPORT)
 #define ENABLE_META_VIEWPORT 1
@@ -1015,7 +1011,7 @@
 #define ENABLE_KINETIC_SCROLLING 1
 #endif
 
-#if !defined(ENABLE_MONOSPACE_FONT_EXCEPTION) && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000))
+#if !defined(ENABLE_MONOSPACE_FONT_EXCEPTION) && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) || PLATFORM(WATCHOS) || PLATFORM(APPLETV))
 #define ENABLE_MONOSPACE_FONT_EXCEPTION 1
 #endif

Modified: trunk/Source/WTF/wtf/PlatformHave.h (255072 => 255073)


--- trunk/Source/WTF/wtf/PlatformHave.h	2020-01-24 15:58:45 UTC (rev 255072)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2020-01-24 16:32:26 UTC (rev 255073)
@@ -339,7 +339,7 @@
 #define HAVE_TOUCH_BAR 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
 #define HAVE_HSTS_STORAGE_PATH 1
 #endif
 
@@ -373,7 +373,7 @@
 #define HAVE_NSHTTPCOOKIESTORAGE__INITWITHIDENTIFIER_WITH_INACCURATE_NULLABILITY 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(GTK)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS) || PLATFORM(MACCATALYST) || PLATFORM(GTK)
 #define HAVE_OS_DARK_MODE_SUPPORT 1
 #endif
 
@@ -422,11 +422,11 @@
 #define HAVE_AUTHORIZATION_STATUS_FOR_MEDIA_TYPE 1
 #endif
 
-#if (PLATFORM(MAC) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101404)) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120200) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && !(__MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101404))
 #define HAVE_CFNETWORK_OVERRIDE_SESSION_COOKIE_ACCEPT_POLICY 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
 #define HAVE_CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE 1
 #endif
 
@@ -450,7 +450,7 @@
 #define HAVE_SANDBOX_ISSUE_READ_EXTENSION_TO_PROCESS_BY_AUDIT_TOKEN 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
 #define HAVE_MDNS_FAST_REGISTRATION 1
 #endif
 
@@ -458,19 +458,19 @@
 #define HAVE_DISALLOWABLE_USER_INSTALLED_FONTS 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
 #define HAVE_CTFONTCREATEFORCHARACTERSWITHLANGUAGEANDOPTION 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
 #define HAVE_CTFONTTRANSFORMGLYPHSWITHLANGUAGE 1
 #endif
 
-#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
+#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
 #define HAVE_ARKIT_QUICK_LOOK_PREVIEW_ITEM 1
 #endif
 
-#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
+#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
 #define HAVE_UI_WK_DOCUMENT_CONTEXT 1
 #endif
 
@@ -490,35 +490,35 @@
 #define HAVE_FAIRPLAYSTREAMING_CENC_INITDATA 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
 #define HAVE_UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
 #define HAVE_APP_LINKS_WITH_ISENABLED 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if PLATFORM(IOS)
 #define HAVE_ROUTE_SHARING_POLICY_LONG_FORM_VIDEO 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 && !PLATFORM(IOS_SIMULATOR))
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
 #define HAVE_DEVICE_MANAGEMENT 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500)
 #define HAVE_NSURLSESSION_WEBSOCKET 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(MACCATALYST)
 #define HAVE_AVPLAYER_RESOURCE_CONSERVATION_LEVEL 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400) && !PLATFORM(MACCATALYST)
 #define HAVE_CORETEXT_AUTO_OPTICAL_SIZING 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500)
 #define HAVE_NSFONT_WITH_OPTICAL_SIZING_BUG 1
 #endif
 
@@ -526,7 +526,7 @@
 #define HAVE_APP_SSO 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000 || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(WATCHOS) || PLATFORM(APPLETV) || PLATFORM(MACCATALYST)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500)
 #define HAVE_TLS_PROTOCOL_VERSION_T 1
 #endif
 
@@ -546,7 +546,7 @@
 #define HAVE_AX_CLIENT_TYPE 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(MACCATALYST)
 #define HAVE_DESIGN_SYSTEM_UI_FONTS 1
 #endif

Modified: trunk/Source/WTF/wtf/PlatformUse.h (255072 => 255073)


--- trunk/Source/WTF/wtf/PlatformUse.h	2020-01-24 15:58:45 UTC (rev 255072)
+++ trunk/Source/WTF/wtf/PlatformUse.h	2020-01-24 16:32:26 UTC (rev 255073)
@@ -300,7 +300,7 @@
 #define USE_UICONTEXTMENU 1
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+#if PLATFORM(COCOA)
 #define USE_PLATFORM_SYSTEM_FALLBACK_LIST 1
 #endif
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to