Title: [229387] trunk/Source/WTF
- Revision
- 229387
- Author
- timothy_hor...@apple.com
- Date
- 2018-03-07 17:15:08 -0800 (Wed, 07 Mar 2018)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (229386 => 229387)
--- trunk/Source/WTF/ChangeLog 2018-03-08 00:39:19 UTC (rev 229386)
+++ trunk/Source/WTF/ChangeLog 2018-03-08 01:15:08 UTC (rev 229387)
@@ -1,3 +1,14 @@
+2018-03-07 Tim Horton <timothy_hor...@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....@apple.com>
Prepare LLInt code to support pointer profiling.
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (229386 => 229387)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2018-03-08 00:39:19 UTC (rev 229386)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2018-03-08 01:15:08 UTC (rev 229387)
@@ -161,7 +161,7 @@
#endif
#if !defined(ENABLE_WKPDFVIEW)
-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !ENABLE(MINIMAL_SIMULATOR)
#define ENABLE_WKPDFVIEW 1
#endif
#endif
@@ -229,10 +229,6 @@
#if PLATFORM(COCOA)
-#if !defined(ENABLE_DATA_DETECTION)
-#define ENABLE_DATA_DETECTION 0
-#endif
-
#if !defined(ENABLE_LEGACY_ENCRYPTED_MEDIA)
#define ENABLE_LEGACY_ENCRYPTED_MEDIA 1
#endif
Modified: trunk/Source/WTF/wtf/Platform.h (229386 => 229387)
--- trunk/Source/WTF/wtf/Platform.h 2018-03-08 00:39:19 UTC (rev 229386)
+++ trunk/Source/WTF/wtf/Platform.h 2018-03-08 01:15:08 UTC (rev 229387)
@@ -560,14 +560,8 @@
#define HAVE_DTRACE 0
#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
-
#if PLATFORM(MAC)
#define USE_APPKIT 1
@@ -596,14 +590,6 @@
#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)
#define ENABLE_JIT_CONSTANT_BLINDING 0
#endif
@@ -696,13 +682,13 @@
/* FIXME: move out all ENABLE() defines from here to FeatureDefines.h */
-/* Include feature macros */
-#include <wtf/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 OS(WINDOWS)
#define USE_SYSTEM_MALLOC 1
#endif
@@ -1035,10 +1021,31 @@
#endif
#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
@@ -1045,6 +1052,12 @@
#endif
#endif
+#if HAVE(ACCESSIBILITY)
+#define USE_ACCESSIBILITY_CONTEXT_MENUS 1
+#endif
+
+#endif
+
#if ENABLE(WEBGL) && PLATFORM(WIN)
#define USE_OPENGL 1
#define USE_OPENGL_ES 1
@@ -1055,14 +1068,6 @@
#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
-
#if CPU(ARM_THUMB2) || CPU(ARM64)
#define ENABLE_BRANCH_COMPACTION 1
#endif
@@ -1099,10 +1104,6 @@
#define ENABLE_BINDING_INTEGRITY 1
#endif
-#if PLATFORM(COCOA)
-#define USE_AVFOUNDATION 1
-#endif
-
#if !defined(ENABLE_TREE_DEBUGGING)
#if !defined(NDEBUG)
#define ENABLE_TREE_DEBUGGING 1
@@ -1193,7 +1194,7 @@
#define HAVE_IOSURFACE 1
#endif
-#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && !ENABLE(MINIMAL_SIMULATOR)
#define HAVE_IOSURFACE_ACCELERATOR 1
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
