Changeset 237069 in webkit

Timestamp:

Oct 12, 2018 9:57:02 AM (6 years ago)

Author:

ap@apple.com

Message:

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.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (18 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-10-11  Alexey Proskuryakov  <ap@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  <yusukesuzuki@slowstart.org>
 

trunk/Source/WTF/wtf/Platform.h

@@ -371 +371 @@
 #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
@@ -511 +512 @@
 /* PLATFORM(MAC) */
 /* PLATFORM(IOS) */
+/* PLATFORM(IOS_FAMILY) */
 /* PLATFORM(IOS_SIMULATOR) */
+/* PLATFORM(IOS_FAMILY_SIMULATOR) */
 /* PLATFORM(WIN) */
 #if defined(BUILDING_GTK__)
@@ -523 +526 @@
 #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
@@ -534 +539 @@
 
 /* PLATFORM(COCOA) */
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
 #define WTF_PLATFORM_COCOA 1
 #endif
@@ -616 +621 @@
 #endif /* PLATFORM(MAC) */
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS_FAMILY)
 
 #define HAVE_NETWORK_EXTENSION 1
@@ -632 +637 @@
 #endif
 
-#endif /* PLATFORM(IOS) */
+#endif /* PLATFORM(IOS_FAMILY) */
 
 #if !defined(HAVE_ACCESSIBILITY)
@@ -689 +694 @@
 #define USE_ACCELERATE 1
 #endif
-#if !PLATFORM(IOS)
+#if !PLATFORM(IOS_FAMILY)
 #define HAVE_HOSTED_CORE_ANIMATION 1
 #endif
@@ -775 +780 @@
 
 /* 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
@@ -801 +806 @@
 #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
@@ -1032 +1037 @@
 /* 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
@@ -1039 +1044 @@
 #endif
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS_FAMILY)
 #if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(IOSMAC)
 #define USE_QUICK_LOOK 1
@@ -1149 +1154 @@
 #endif
 
-#if PLATFORM(IOS) || PLATFORM(MAC)
+#if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
 #define USE_COREMEDIA 1
 #define USE_VIDEOTOOLBOX 1
@@ -1160 +1165 @@
 #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
@@ -1221 +1226 @@
 #endif
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
 #define HAVE_AVASSETREADER 1
 #endif
@@ -1233 +1238 @@
 #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
@@ -1284 +1289 @@
 #endif
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
 #define USE_OS_LOG 1
 #if USE(APPLE_INTERNAL_SDK)
@@ -1319 +1324 @@
 #endif
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
 #define USE_MEDIAREMOTE 1
 #endif
@@ -1363 +1368 @@
 #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