Changeset 229387 in webkit

Timestamp:

Mar 7, 2018 5:15:08 PM (6 years ago)

Author:

timothy_horton@apple.com

Message:

Shuffle around some feature flags for minimal simulator mode
​https://bugs.webkit.org/show_bug.cgi?id=183419
<rdar://problem/37694987>

Reviewed by Beth Dakin.

• wtf/FeatureDefines.h:
• wtf/Platform.h:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/FeatureDefines.h (modified) (2 diffs)
• wtf/Platform.h (modified) (7 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-03-07  Tim Horton  <timothy_horton@apple.com>
+
+        Shuffle around some feature flags for minimal simulator mode
+        https://bugs.webkit.org/show_bug.cgi?id=183419
+        <rdar://problem/37694987>
+
+        Reviewed by Beth Dakin.
+
+        * wtf/FeatureDefines.h:
+        * wtf/Platform.h:
+
 2018-03-06  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WTF/wtf/FeatureDefines.h

@@ -162 +162 @@
 
 #if !defined(ENABLE_WKPDFVIEW)
-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !ENABLE(MINIMAL_SIMULATOR)
 #define ENABLE_WKPDFVIEW 1
 #endif
@@ -229 +229 @@
 
 #if PLATFORM(COCOA)
-
-#if !defined(ENABLE_DATA_DETECTION)
-#define ENABLE_DATA_DETECTION 0
-#endif
 
 #if !defined(ENABLE_LEGACY_ENCRYPTED_MEDIA)

trunk/Source/WTF/wtf/Platform.h

@@ -561 +561 @@
 #define USE_FILE_LOCK 1
 
-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
-#define ENABLE_DATA_DETECTION 1
-#define HAVE_AVKIT 1
-#define HAVE_PARENTAL_CONTROLS 1
-#endif
-
 #endif
 
@@ -596 +590 @@
 #define USE_UIKIT_EDITING 1
 #define USE_WEB_THREAD 1
-
-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
-#define USE_QUICK_LOOK 1
-#endif
-
-#if TARGET_OS_IOS
-#define HAVE_APP_LINKS 1
-#endif
 
 #if CPU(ARM64)
@@ -697 +683 @@
 /* FIXME: move out all ENABLE() defines from here to FeatureDefines.h */
 
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/AdditionalFeatureDefines.h>)
+#include <WebKitAdditions/AdditionalFeatureDefines.h>
+#endif
+
 /* Include feature macros */
 #include <wtf/FeatureDefines.h>
-
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/AdditionalFeatureDefines.h>)
-#include <WebKitAdditions/AdditionalFeatureDefines.h>
-#endif
 
 #if OS(WINDOWS)
@@ -1036 +1022 @@
 #endif
 
-#if ENABLE(WEBGL) && PLATFORM(COCOA)
+#if PLATFORM(IOS)
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !ENABLE(MINIMAL_SIMULATOR)
+#define USE_QUICK_LOOK 1
+#define HAVE_APP_LINKS 1
+#endif
+#endif
+
+#if PLATFORM(COCOA)
+
+#define USE_AVFOUNDATION 1
+#define USE_PROTECTION_SPACE_AUTH_CALLBACK 1
+
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !ENABLE(MINIMAL_SIMULATOR)
+#define ENABLE_DATA_DETECTION 1
+#define HAVE_AVKIT 1
+#define HAVE_PARENTAL_CONTROLS 1
+#endif
+
+#if ENABLE(WEBGL)
 #if PLATFORM(MAC)
 #define USE_OPENGL 1
 #define USE_OPENGL_ES 0
+#elif ENABLE(MINIMAL_SIMULATOR)
+#define USE_OPENGL 1
+#define USE_OPENGL_ES 0
 #else
 #define USE_OPENGL 0
 #define USE_OPENGL_ES 1
 #endif
+#endif
+
+#if HAVE(ACCESSIBILITY)
+#define USE_ACCESSIBILITY_CONTEXT_MENUS 1
+#endif
+
 #endif
 
@@ -1054 +1067 @@
 #if USE(TEXTURE_MAPPER) && ENABLE(GRAPHICS_CONTEXT_3D) && !defined(USE_TEXTURE_MAPPER_GL)
 #define USE_TEXTURE_MAPPER_GL 1
-#endif
-
-#if PLATFORM(COCOA)
-#define USE_PROTECTION_SPACE_AUTH_CALLBACK 1
-#endif
-
-#if PLATFORM(COCOA) && HAVE(ACCESSIBILITY)
-#define USE_ACCESSIBILITY_CONTEXT_MENUS 1
 #endif
 
@@ -1100 +1105 @@
 #endif
 
-#if PLATFORM(COCOA)
-#define USE_AVFOUNDATION 1
-#endif
-
 #if !defined(ENABLE_TREE_DEBUGGING)
 #if !defined(NDEBUG)
@@ -1194 +1195 @@
 #endif
 
-#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && !ENABLE(MINIMAL_SIMULATOR)
 #define HAVE_IOSURFACE_ACCELERATOR 1
 #endif