Modified: trunk/Source/WTF/ChangeLog (237068 => 237069)
--- trunk/Source/WTF/ChangeLog 2018-10-12 16:07:59 UTC (rev 237068)
+++ trunk/Source/WTF/ChangeLog 2018-10-12 16:57:02 UTC (rev 237069)
@@ -1,3 +1,18 @@
+2018-10-11 Alexey Proskuryakov <a...@apple.com>
+
+ Add PLATFORM(IOS_FAMILY) and OS(IOS_FAMILY)
+ https://bugs.webkit.org/show_bug.cgi?id=190477
+
+ Reviewed by Tim Horton.
+
+ Currently, PLATFORM(IOS) and OS(IOS) are true when building for any
+ TARGET_OS_IPHONE target, which is quite confusing. Add a better named alternative,
+ as a first step towards mass replacing PLATFORM(IOS). Can't so it all at once
+ because of dependencies in other source repositories.
+
+ * wtf/Platform.h: Changed to the new name in this file though. Kept a few
+ instances that actually target iOS only, having a version check.
+
2018-10-11 Yusuke Suzuki <yusukesuz...@slowstart.org>
Use currentStackPointer more
Modified: trunk/Source/WTF/wtf/Platform.h (237068 => 237069)
--- trunk/Source/WTF/wtf/Platform.h 2018-10-12 16:07:59 UTC (rev 237068)
+++ trunk/Source/WTF/wtf/Platform.h 2018-10-12 16:57:02 UTC (rev 237069)
@@ -370,11 +370,12 @@
#include <TargetConditionals.h>
#endif
-/* OS(IOS) - iOS */
-/* OS(MAC_OS_X) - Mac OS X (not including iOS) */
+/* OS(IOS_FAMILY) - iOS family, including iOSMac */
+/* OS(MAC_OS_X) - macOS (not including iOS family) */
#if OS(DARWIN)
#if TARGET_OS_IPHONE
#define WTF_OS_IOS 1
+#define WTF_OS_IOS_FAMILY 1
#elif TARGET_OS_MAC
#define WTF_OS_MAC_OS_X 1
#endif
@@ -510,7 +511,9 @@
/* PLATFORM(GTK) */
/* PLATFORM(MAC) */
/* PLATFORM(IOS) */
+/* PLATFORM(IOS_FAMILY) */
/* PLATFORM(IOS_SIMULATOR) */
+/* PLATFORM(IOS_FAMILY_SIMULATOR) */
/* PLATFORM(WIN) */
#if defined(BUILDING_GTK__)
#define WTF_PLATFORM_GTK 1
@@ -522,8 +525,10 @@
#define WTF_PLATFORM_MAC 1
#elif OS(IOS)
#define WTF_PLATFORM_IOS 1
+#define WTF_PLATFORM_IOS_FAMILY 1
#if TARGET_OS_SIMULATOR
#define WTF_PLATFORM_IOS_SIMULATOR 1
+#define WTF_PLATFORM_IOS_FAMILY_SIMULATOR 1
#endif
#if defined(TARGET_OS_IOSMAC) && TARGET_OS_IOSMAC
#define WTF_PLATFORM_IOSMAC 1
@@ -533,7 +538,7 @@
#endif
/* PLATFORM(COCOA) */
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
#define WTF_PLATFORM_COCOA 1
#endif
@@ -615,7 +620,7 @@
#endif
#endif /* PLATFORM(MAC) */
-#if PLATFORM(IOS)
+#if PLATFORM(IOS_FAMILY)
#define HAVE_NETWORK_EXTENSION 1
#define HAVE_READLINE 1
@@ -631,7 +636,7 @@
#define HAVE_ARM_NEON_INTRINSICS 0
#endif
-#endif /* PLATFORM(IOS) */
+#endif /* PLATFORM(IOS_FAMILY) */
#if !defined(HAVE_ACCESSIBILITY)
#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(WPE)
@@ -688,7 +693,7 @@
#if !PLATFORM(GTK)
#define USE_ACCELERATE 1
#endif
-#if !PLATFORM(IOS)
+#if !PLATFORM(IOS_FAMILY)
#define HAVE_HOSTED_CORE_ANIMATION 1
#endif
@@ -774,7 +779,7 @@
#endif
/* The FTL is disabled on the iOS simulator, mostly for simplicity. */
-#if PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(IOS_FAMILY_SIMULATOR)
#undef ENABLE_FTL_JIT
#define ENABLE_FTL_JIT 0
#endif
@@ -800,7 +805,7 @@
#define ENABLE_DFG_JIT 1
#endif
/* Enable the DFG JIT on ARMv7. Only tested on iOS, Linux, and FreeBSD. */
-#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS) || OS(LINUX) || OS(FREEBSD))
+#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS_FAMILY) || OS(LINUX) || OS(FREEBSD))
#define ENABLE_DFG_JIT 1
#endif
/* Enable the DFG JIT on ARM. */
@@ -1031,7 +1036,7 @@
/* CSS Selector JIT Compiler */
#if !defined(ENABLE_CSS_SELECTOR_JIT)
-#if (CPU(X86_64) || CPU(ARM64) || (CPU(ARM_THUMB2) && PLATFORM(IOS))) && ENABLE(JIT) && (OS(DARWIN) || PLATFORM(GTK) || PLATFORM(WPE))
+#if (CPU(X86_64) || CPU(ARM64) || (CPU(ARM_THUMB2) && PLATFORM(IOS_FAMILY))) && ENABLE(JIT) && (OS(DARWIN) || PLATFORM(GTK) || PLATFORM(WPE))
#define ENABLE_CSS_SELECTOR_JIT 1
#else
#define ENABLE_CSS_SELECTOR_JIT 0
@@ -1038,7 +1043,7 @@
#endif
#endif
-#if PLATFORM(IOS)
+#if PLATFORM(IOS_FAMILY)
#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(IOSMAC)
#define USE_QUICK_LOOK 1
#define HAVE_APP_LINKS 1
@@ -1148,7 +1153,7 @@
#endif
#endif
-#if PLATFORM(IOS) || PLATFORM(MAC)
+#if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
#define USE_COREMEDIA 1
#define USE_VIDEOTOOLBOX 1
@@ -1159,16 +1164,16 @@
#endif
#endif
-#if PLATFORM(IOS) || PLATFORM(MAC)
+#if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
#endif
-#if PLATFORM(IOS) || PLATFORM(MAC)
+#if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
#endif
-#if PLATFORM(IOS) || PLATFORM(MAC)
+#if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
#define HAVE_AVFOUNDATION_LOADER_DELEGATE 1
#endif
@@ -1220,7 +1225,7 @@
#define USE_INSERTION_UNDO_GROUPING 1
#endif
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
#define HAVE_AVASSETREADER 1
#endif
@@ -1232,11 +1237,11 @@
#define USE_AUDIO_SESSION 1
#endif
-#if PLATFORM(COCOA) && !PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(COCOA) && !PLATFORM(IOS_FAMILY_SIMULATOR)
#define HAVE_IOSURFACE 1
#endif
-#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && !PLATFORM(IOSMAC)
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(IOSMAC)
#define HAVE_IOSURFACE_ACCELERATOR 1
#endif
@@ -1283,7 +1288,7 @@
#define USE_MEDIATOOLBOX 1
#endif
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
#define USE_OS_LOG 1
#if USE(APPLE_INTERNAL_SDK)
#define USE_OS_STATE 1
@@ -1318,7 +1323,7 @@
#endif
#endif
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
#define USE_MEDIAREMOTE 1
#endif
@@ -1362,7 +1367,7 @@
#define HAVE_SEC_KEY_PROXY 1
#endif
-#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_FAMILY_SIMULATOR)
#define USE_IOSURFACE_CANVAS_BACKING_STORE 1
#endif
