Add and adopt WK_PLATFORM_NAME and adjust default feature defines
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Mar 2018 18:18:37 +0000 (18:18 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Mar 2018 18:18:37 +0000 (18:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=183758
<rdar://problem/38017644>

Reviewed by Dan Bernstein.

* .../Configurations/Base.xcconfig:
* .../Configurations/FeatureDefines.xcconfig:
* WebCore.xcodeproj/project.pbxproj:
* wtf/FeatureDefines.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229768 268f45cc-cd09-0410-ab3c-d52691b4dbfc

26 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/Base.xcconfig
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
Source/WTF/ChangeLog
Source/WTF/Configurations/Base.xcconfig
Source/WTF/wtf/FeatureDefines.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/Base.xcconfig
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/Base.xcconfig
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebInspectorUI/Configurations/Base.xcconfig
Source/WebKit/ChangeLog
Source/WebKit/Configurations/Base.xcconfig
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/Base.xcconfig
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Source/bmalloc/ChangeLog
Source/bmalloc/Configurations/Base.xcconfig
Tools/ChangeLog
Tools/TestWebKitAPI/Configurations/Base.xcconfig
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index a65a501..0b57061 100644 (file)
@@ -1,3 +1,13 @@
+2018-03-20  Tim Horton  <timothy_horton@apple.com>
+
+        Add and adopt WK_PLATFORM_NAME and adjust default feature defines
+        https://bugs.webkit.org/show_bug.cgi?id=183758
+        <rdar://problem/38017644>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2018-03-20  Mark Lam  <mark.lam@apple.com>
 
         Improve FunctionPtr and use it in the JIT CallRecord.
index 73f55e9..185a818 100644 (file)
@@ -165,3 +165,7 @@ WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
 
 WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index dc66f4a..1f4e8fc 100644 (file)
@@ -33,8 +33,9 @@
 
 #include "WebKitTargetConditionals.xcconfig"
 
-WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(PLATFORM_NAME));
+WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
 WK_COCOA_TOUCH_iphoneos = cocoatouch;
+WK_COCOA_TOUCH_iphoneminimalsimulator = cocoatouch;
 WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
 WK_COCOA_TOUCH_watchos = cocoatouch;
 WK_COCOA_TOUCH_watchsimulator = cocoatouch;
@@ -48,13 +49,13 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING = $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_$(WK_COCOA_TOUCH));
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
 
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_macosx = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
@@ -70,8 +71,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 
 ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
-ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(PLATFORM_NAME));
+ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_iphoneminimalsimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
@@ -99,48 +101,65 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
 
 ENABLE_CUSTOM_SCHEME_HANDLER = ;
 
-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
 
 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 
 ENABLE_DATALIST_ELEMENT = ;
 
-ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
+ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
 
-ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_COCOA_TOUCH));
-ENABLE_DEVICE_ORIENTATION_cocoatouch = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
+ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION;
 
-ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
 
 ENABLE_EXTRA_ZOOM_MODE = ;
 
-ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(PLATFORM_NAME));
+ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
+ENABLE_FAST_JIT_PERMISSIONS_iphoneminimalsimulator = ENABLE_FAST_JIT_PERMISSIONS;
 
 ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
 
-ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME))
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneminimalsimulator = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
 
-ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
+ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(WK_PLATFORM_NAME));
 ENABLE_FULLSCREEN_API_iphoneos = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_iphonesimulator = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_IOS_SINCE_12 = ENABLE_FULLSCREEN_API;
 ENABLE_FULLSCREEN_API_macosx = ENABLE_FULLSCREEN_API;
 
-ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(PLATFORM_NAME));
+ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD_iphoneminimalsimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
@@ -148,17 +167,17 @@ ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
 
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 
-ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
+ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
 
-ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_macosx = ENABLE_INPUT_TYPE_COLOR;
 
-ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_POPOVER_macosx = ENABLE_INPUT_TYPE_COLOR_POPOVER;
 
 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
@@ -200,15 +219,22 @@ ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
 
 ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER = ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER;
 
-ENABLE_LEGACY_ENCRYPTED_MEDIA = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA = $(ENABLE_LEGACY_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_macosx = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 
 ENABLE_LETTERPRESS = $(ENABLE_LETTERPRESS_$(WK_COCOA_TOUCH));
 ENABLE_LETTERPRESS_cocoatouch = ENABLE_LETTERPRESS;
 
-ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
-ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_VIDEO_TOOLBOX_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_VIDEO_TOOLBOX;
 
 ENABLE_MATHML = ENABLE_MATHML;
@@ -220,18 +246,25 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SESSION = ;
 
-ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(PLATFORM_NAME));
+ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
 
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME));
+ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
 ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
 
 ENABLE_MHTML = ;
 
-ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(PLATFORM_NAME));
+ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
@@ -239,15 +272,15 @@ ENABLE_NAVIGATOR_CONTENT_UTILS = ;
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
-ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
+ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
 ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
 
-ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
+ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(WK_PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
 
-ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(PLATFORM_NAME));
+ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
 ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
@@ -260,15 +293,22 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 
 ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
 
-ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(PLATFORM_NAME));
+ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
-ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
 ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
 
-ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
+ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
 
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 
@@ -289,16 +329,18 @@ ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
 
 ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
 
-ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
+ENABLE_VARIATION_FONTS_iphoneminimalsimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
 ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(PLATFORM_NAME));
+ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
@@ -309,7 +351,7 @@ ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
-ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(PLATFORM_NAME));
+ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_macosx = ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN;
 
 ENABLE_WEBASSEMBLY = ;
@@ -318,7 +360,7 @@ ENABLE_WEBGL = ENABLE_WEBGL;
 
 ENABLE_WEBGL2 = ENABLE_WEBGL2;
 
-ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(PLATFORM_NAME));
+ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
@@ -326,12 +368,12 @@ ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
 
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 
-ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(PLATFORM_NAME));
+ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME));
 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_macosx[arch=x86_64] = ENABLE_WEB_AUTHN;
 
-ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(PLATFORM_NAME));
+ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME));
 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_macosx[arch=x86_64] = ENABLE_WEB_RTC;
index bdec268..1254837 100644 (file)
@@ -74,3 +74,7 @@ WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_
 
 ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 ANGLE_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR);
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index e4c4215..429f052 100644 (file)
@@ -1,3 +1,13 @@
+2018-03-20  Tim Horton  <timothy_horton@apple.com>
+
+        Add and adopt WK_PLATFORM_NAME and adjust default feature defines
+        https://bugs.webkit.org/show_bug.cgi?id=183758
+        <rdar://problem/38017644>
+
+        Reviewed by Dan Bernstein.
+
+        * wtf/FeatureDefines.h:
+
 2018-03-19  Eric Carlson  <eric.carlson@apple.com>
 
         [Extra zoom mode] Require fullscreen for video playback
index b10e5d1..b22d480 100644 (file)
@@ -137,3 +137,7 @@ WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_
 
 WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 WTF_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index 0687387..f4e1462 100644 (file)
@@ -230,8 +230,12 @@ the public iOS SDK. See <https://webkit.org/b/179167>. */
 #if PLATFORM(COCOA)
 
 #if !defined(ENABLE_LEGACY_ENCRYPTED_MEDIA)
+#if ENABLE(MINIMAL_SIMULATOR)
+#define ENABLE_LEGACY_ENCRYPTED_MEDIA 0
+#else
 #define ENABLE_LEGACY_ENCRYPTED_MEDIA 1
 #endif
+#endif
 
 #if !defined(ENABLE_FILE_REPLACEMENT)
 #define ENABLE_FILE_REPLACEMENT 1
index 9eeed30..c87acf3 100644 (file)
@@ -1,3 +1,15 @@
+2018-03-20  Tim Horton  <timothy_horton@apple.com>
+
+        Add and adopt WK_PLATFORM_NAME and adjust default feature defines
+        https://bugs.webkit.org/show_bug.cgi?id=183758
+        <rdar://problem/38017644>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/FeatureDefines.xcconfig:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2018-03-19  Tim Horton  <timothy_horton@apple.com>
 
         Apply some SDK checks in LocalDefaultSystemAppearance
index 56f0f04..4060f26 100644 (file)
@@ -120,3 +120,13 @@ OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
 
 // This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.
 LLVM_TARGET_TRIPLE_SUFFIX = $(inherited);
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index dc66f4a..1f4e8fc 100644 (file)
@@ -33,8 +33,9 @@
 
 #include "WebKitTargetConditionals.xcconfig"
 
-WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(PLATFORM_NAME));
+WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
 WK_COCOA_TOUCH_iphoneos = cocoatouch;
+WK_COCOA_TOUCH_iphoneminimalsimulator = cocoatouch;
 WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
 WK_COCOA_TOUCH_watchos = cocoatouch;
 WK_COCOA_TOUCH_watchsimulator = cocoatouch;
@@ -48,13 +49,13 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING = $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_$(WK_COCOA_TOUCH));
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
 
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_macosx = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
@@ -70,8 +71,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 
 ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
-ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(PLATFORM_NAME));
+ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_iphoneminimalsimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
@@ -99,48 +101,65 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
 
 ENABLE_CUSTOM_SCHEME_HANDLER = ;
 
-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
 
 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 
 ENABLE_DATALIST_ELEMENT = ;
 
-ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
+ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
 
-ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_COCOA_TOUCH));
-ENABLE_DEVICE_ORIENTATION_cocoatouch = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
+ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION;
 
-ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
 
 ENABLE_EXTRA_ZOOM_MODE = ;
 
-ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(PLATFORM_NAME));
+ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
+ENABLE_FAST_JIT_PERMISSIONS_iphoneminimalsimulator = ENABLE_FAST_JIT_PERMISSIONS;
 
 ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
 
-ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME))
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneminimalsimulator = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
 
-ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
+ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(WK_PLATFORM_NAME));
 ENABLE_FULLSCREEN_API_iphoneos = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_iphonesimulator = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_IOS_SINCE_12 = ENABLE_FULLSCREEN_API;
 ENABLE_FULLSCREEN_API_macosx = ENABLE_FULLSCREEN_API;
 
-ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(PLATFORM_NAME));
+ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD_iphoneminimalsimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
@@ -148,17 +167,17 @@ ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
 
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 
-ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
+ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
 
-ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_macosx = ENABLE_INPUT_TYPE_COLOR;
 
-ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_POPOVER_macosx = ENABLE_INPUT_TYPE_COLOR_POPOVER;
 
 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
@@ -200,15 +219,22 @@ ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
 
 ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER = ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER;
 
-ENABLE_LEGACY_ENCRYPTED_MEDIA = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA = $(ENABLE_LEGACY_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_macosx = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 
 ENABLE_LETTERPRESS = $(ENABLE_LETTERPRESS_$(WK_COCOA_TOUCH));
 ENABLE_LETTERPRESS_cocoatouch = ENABLE_LETTERPRESS;
 
-ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
-ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_VIDEO_TOOLBOX_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_VIDEO_TOOLBOX;
 
 ENABLE_MATHML = ENABLE_MATHML;
@@ -220,18 +246,25 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SESSION = ;
 
-ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(PLATFORM_NAME));
+ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
 
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME));
+ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
 ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
 
 ENABLE_MHTML = ;
 
-ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(PLATFORM_NAME));
+ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
@@ -239,15 +272,15 @@ ENABLE_NAVIGATOR_CONTENT_UTILS = ;
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
-ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
+ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
 ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
 
-ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
+ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(WK_PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
 
-ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(PLATFORM_NAME));
+ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
 ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
@@ -260,15 +293,22 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 
 ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
 
-ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(PLATFORM_NAME));
+ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
-ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
 ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
 
-ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
+ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
 
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 
@@ -289,16 +329,18 @@ ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
 
 ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
 
-ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
+ENABLE_VARIATION_FONTS_iphoneminimalsimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
 ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(PLATFORM_NAME));
+ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
@@ -309,7 +351,7 @@ ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
-ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(PLATFORM_NAME));
+ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_macosx = ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN;
 
 ENABLE_WEBASSEMBLY = ;
@@ -318,7 +360,7 @@ ENABLE_WEBGL = ENABLE_WEBGL;
 
 ENABLE_WEBGL2 = ENABLE_WEBGL2;
 
-ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(PLATFORM_NAME));
+ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
@@ -326,12 +368,12 @@ ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
 
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 
-ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(PLATFORM_NAME));
+ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME));
 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_macosx[arch=x86_64] = ENABLE_WEB_AUTHN;
 
-ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(PLATFORM_NAME));
+ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME));
 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_macosx[arch=x86_64] = ENABLE_WEB_RTC;
index e70d2ac..7209765 100644 (file)
@@ -1,3 +1,13 @@
+2018-03-20  Tim Horton  <timothy_horton@apple.com>
+
+        Add and adopt WK_PLATFORM_NAME and adjust default feature defines
+        https://bugs.webkit.org/show_bug.cgi?id=183758
+        <rdar://problem/38017644>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2018-03-19  Jiewen Tan  <jiewen_tan@apple.com>
 
         Unreviewed, another quick fix for r229699
index be0dad3..c3f7f7d 100644 (file)
@@ -117,3 +117,13 @@ SDKROOT = macosx.internal;
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index dc66f4a..1f4e8fc 100644 (file)
@@ -33,8 +33,9 @@
 
 #include "WebKitTargetConditionals.xcconfig"
 
-WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(PLATFORM_NAME));
+WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
 WK_COCOA_TOUCH_iphoneos = cocoatouch;
+WK_COCOA_TOUCH_iphoneminimalsimulator = cocoatouch;
 WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
 WK_COCOA_TOUCH_watchos = cocoatouch;
 WK_COCOA_TOUCH_watchsimulator = cocoatouch;
@@ -48,13 +49,13 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING = $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_$(WK_COCOA_TOUCH));
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
 
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_macosx = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
@@ -70,8 +71,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 
 ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
-ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(PLATFORM_NAME));
+ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_iphoneminimalsimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
@@ -99,48 +101,65 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
 
 ENABLE_CUSTOM_SCHEME_HANDLER = ;
 
-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
 
 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 
 ENABLE_DATALIST_ELEMENT = ;
 
-ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
+ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
 
-ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_COCOA_TOUCH));
-ENABLE_DEVICE_ORIENTATION_cocoatouch = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
+ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION;
 
-ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
 
 ENABLE_EXTRA_ZOOM_MODE = ;
 
-ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(PLATFORM_NAME));
+ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
+ENABLE_FAST_JIT_PERMISSIONS_iphoneminimalsimulator = ENABLE_FAST_JIT_PERMISSIONS;
 
 ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
 
-ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME))
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneminimalsimulator = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
 
-ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
+ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(WK_PLATFORM_NAME));
 ENABLE_FULLSCREEN_API_iphoneos = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_iphonesimulator = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_IOS_SINCE_12 = ENABLE_FULLSCREEN_API;
 ENABLE_FULLSCREEN_API_macosx = ENABLE_FULLSCREEN_API;
 
-ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(PLATFORM_NAME));
+ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD_iphoneminimalsimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
@@ -148,17 +167,17 @@ ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
 
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 
-ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
+ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
 
-ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_macosx = ENABLE_INPUT_TYPE_COLOR;
 
-ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_POPOVER_macosx = ENABLE_INPUT_TYPE_COLOR_POPOVER;
 
 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
@@ -200,15 +219,22 @@ ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
 
 ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER = ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER;
 
-ENABLE_LEGACY_ENCRYPTED_MEDIA = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA = $(ENABLE_LEGACY_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_macosx = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 
 ENABLE_LETTERPRESS = $(ENABLE_LETTERPRESS_$(WK_COCOA_TOUCH));
 ENABLE_LETTERPRESS_cocoatouch = ENABLE_LETTERPRESS;
 
-ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
-ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_VIDEO_TOOLBOX_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_VIDEO_TOOLBOX;
 
 ENABLE_MATHML = ENABLE_MATHML;
@@ -220,18 +246,25 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SESSION = ;
 
-ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(PLATFORM_NAME));
+ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
 
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME));
+ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
 ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
 
 ENABLE_MHTML = ;
 
-ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(PLATFORM_NAME));
+ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
@@ -239,15 +272,15 @@ ENABLE_NAVIGATOR_CONTENT_UTILS = ;
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
-ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
+ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
 ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
 
-ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
+ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(WK_PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
 
-ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(PLATFORM_NAME));
+ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
 ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
@@ -260,15 +293,22 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 
 ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
 
-ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(PLATFORM_NAME));
+ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
-ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
 ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
 
-ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
+ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
 
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 
@@ -289,16 +329,18 @@ ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
 
 ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
 
-ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
+ENABLE_VARIATION_FONTS_iphoneminimalsimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
 ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(PLATFORM_NAME));
+ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
@@ -309,7 +351,7 @@ ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
-ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(PLATFORM_NAME));
+ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_macosx = ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN;
 
 ENABLE_WEBASSEMBLY = ;
@@ -318,7 +360,7 @@ ENABLE_WEBGL = ENABLE_WEBGL;
 
 ENABLE_WEBGL2 = ENABLE_WEBGL2;
 
-ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(PLATFORM_NAME));
+ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
@@ -326,12 +368,12 @@ ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
 
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 
-ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(PLATFORM_NAME));
+ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME));
 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_macosx[arch=x86_64] = ENABLE_WEB_AUTHN;
 
-ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(PLATFORM_NAME));
+ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME));
 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_macosx[arch=x86_64] = ENABLE_WEB_RTC;
index 28929b8..48b71c5 100644 (file)
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "set -e\n\ncase $PLATFORM_NAME in\niphone*)\n    TBD_PLATFORM=ios\n    ;;\nappletv*)\n    TBD_PLATFORM=tvos\n    ;;\nesac\n\nif [[ -n $TBD_PLATFORM ]]; then\n    sed -E s/\\TBD_PLATFORM/$TBD_PLATFORM/ \"${SCRIPT_INPUT_FILE_0}\" > \"${SCRIPT_OUTPUT_FILE_0}\"\nfi\n";
+                       shellScript = "set -e\n\ncase $WK_PLATFORM_NAME in\niphone*)\n    TBD_PLATFORM=ios\n    ;;\nappletv*)\n    TBD_PLATFORM=tvos\n    ;;\nesac\n\nif [[ -n $TBD_PLATFORM ]]; then\n    sed -E s/\\TBD_PLATFORM/$TBD_PLATFORM/ \"${SCRIPT_INPUT_FILE_0}\" > \"${SCRIPT_OUTPUT_FILE_0}\"\nfi\n";
                };
                37A1EAA3142699BC0087F425 /* Check For Inappropriate Objective-C Class Names */ = {
                        isa = PBXShellScriptBuildPhase;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "set -e\n\ncd $SRCROOT\n\nif [ \"${DEPLOYMENT_LOCATION}\" == \"YES\" ]; then\nBUILD_SCRIPTS_DIR=\"${SDKROOT}/usr/local/include/wtf/Scripts\"\nelse\nBUILD_SCRIPTS_DIR=\"${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts\"\nfi\n\nUnifiedSourceCppFileCount=530\nUnifiedSourceMmFileCount=60\n\necho \"Using unified source list files: Sources.txt, SourcesCocoa.txt, Sources${PLATFORM_NAME}.txt\"\n\n/usr/bin/env ruby \"${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb\" \"--derived-sources-path\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\" \"--source-tree-path\" \"${SRCROOT}\" \"--feature-flags\" \"${FEATURE_DEFINES}\" \"--max-cpp-bundle-count\" \"${UnifiedSourceCppFileCount}\" \"--max-obj-c-bundle-count\" \"${UnifiedSourceMmFileCount}\" \"Sources.txt\" \"SourcesCocoa.txt\" > /dev/null\n";
+                       shellScript = "set -e\n\ncd $SRCROOT\n\nif [ \"${DEPLOYMENT_LOCATION}\" == \"YES\" ]; then\nBUILD_SCRIPTS_DIR=\"${SDKROOT}/usr/local/include/wtf/Scripts\"\nelse\nBUILD_SCRIPTS_DIR=\"${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts\"\nfi\n\nUnifiedSourceCppFileCount=530\nUnifiedSourceMmFileCount=60\n\necho \"Using unified source list files: Sources.txt, SourcesCocoa.txt\"\n\n/usr/bin/env ruby \"${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb\" \"--derived-sources-path\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\" \"--source-tree-path\" \"${SRCROOT}\" \"--feature-flags\" \"${FEATURE_DEFINES}\" \"--max-cpp-bundle-count\" \"${UnifiedSourceCppFileCount}\" \"--max-obj-c-bundle-count\" \"${UnifiedSourceMmFileCount}\" \"Sources.txt\" \"SourcesCocoa.txt\" > /dev/null\n";
                };
                5D0D540D0E9862F60029E223 /* Check For Weak VTables and Externals */ = {
                        isa = PBXShellScriptBuildPhase;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "SRC_DIR=\"$SRCROOT/Modules/modern-media-controls\"\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls\"\n\nmkdir -p \"$DST_DIR\"\n\nif [ \"${PLATFORM_NAME}\" == \"macosx\" ]; then\n    IMG_OS_PREFIX=\"macOS\"\nelse\n    IMG_OS_PREFIX=\"iOS\"\nfi\n\nif [ -n \"$IMG_OS_PREFIX\" ]; then\nrsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$SRC_DIR/images/$IMG_OS_PREFIX/\" \"$DST_DIR/images\"\nfi\n\ncd \"$SRC_DIR\"\ncat controls/*.css > \"$DST_DIR/modern-media-controls.css\"\n             cat `cat js-files` > \"$DST_DIR/modern-media-controls.js\"\n";
+                       shellScript = "SRC_DIR=\"$SRCROOT/Modules/modern-media-controls\"\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls\"\n\nmkdir -p \"$DST_DIR\"\n\nif [ \"${WK_PLATFORM_NAME}\" == \"macosx\" ]; then\n    IMG_OS_PREFIX=\"macOS\"\nelse\n    IMG_OS_PREFIX=\"iOS\"\nfi\n\nif [ -n \"$IMG_OS_PREFIX\" ]; then\nrsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$SRC_DIR/images/$IMG_OS_PREFIX/\" \"$DST_DIR/images\"\nfi\n\ncd \"$SRC_DIR\"\ncat controls/*.css > \"$DST_DIR/modern-media-controls.css\"\n             cat `cat js-files` > \"$DST_DIR/modern-media-controls.js\"\n";
                };
                A5E79CEC1E67F2CF00FB8153 /* Make Frameworks Symbolic Link */ = {
                        isa = PBXShellScriptBuildPhase;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n    exit 0\nfi\n\nif [[ ${WK_USE_OVERRIDE_FRAMEWORKS_DIR} == \"YES\" ]]; then\n    exit 0\nfi\n\n# ENABLE_WEB_RTC cannot be relied on because of its conditionals.\nif [[ ${CONFIGURATION} == \"Production\" && ${TARGET_MAC_OS_X_VERSION_MAJOR} < 101300 ]]; then\n    exit 0\nfi\n\nln -shf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebCore.framework/Frameworks\"\n";
+                       shellScript = "if [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\n    exit 0\nfi\n\nif [[ ${WK_USE_OVERRIDE_FRAMEWORKS_DIR} == \"YES\" ]]; then\n    exit 0\nfi\n\n# ENABLE_WEB_RTC cannot be relied on because of its conditionals.\nif [[ ${CONFIGURATION} == \"Production\" && ${TARGET_MAC_OS_X_VERSION_MAJOR} < 101300 ]]; then\n    exit 0\nfi\n\nln -shf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebCore.framework/Frameworks\"\n";
                };
                DD041FBD09D9DDBE0010AF2A /* Generate Derived Sources */ = {
                        isa = PBXShellScriptBuildPhase;
index 64807e4..f717400 100644 (file)
@@ -83,9 +83,14 @@ WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
 
 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
 WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index 07d2715..3bb4aa5 100644 (file)
@@ -1,3 +1,13 @@
+2018-03-20  Tim Horton  <timothy_horton@apple.com>
+
+        Add and adopt WK_PLATFORM_NAME and adjust default feature defines
+        https://bugs.webkit.org/show_bug.cgi?id=183758
+        <rdar://problem/38017644>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2018-03-20  Chris Dumez  <cdumez@apple.com>
 
         Unreviewed, rolling out r229726 and r229763.
index a4319a8..452dbc2 100644 (file)
@@ -130,3 +130,13 @@ TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic;
 
 // This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.
 LLVM_TARGET_TRIPLE_SUFFIX = $(inherited);
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index dc66f4a..1f4e8fc 100644 (file)
@@ -33,8 +33,9 @@
 
 #include "WebKitTargetConditionals.xcconfig"
 
-WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(PLATFORM_NAME));
+WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
 WK_COCOA_TOUCH_iphoneos = cocoatouch;
+WK_COCOA_TOUCH_iphoneminimalsimulator = cocoatouch;
 WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
 WK_COCOA_TOUCH_watchos = cocoatouch;
 WK_COCOA_TOUCH_watchsimulator = cocoatouch;
@@ -48,13 +49,13 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING = $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_$(WK_COCOA_TOUCH));
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
 
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_macosx = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
@@ -70,8 +71,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 
 ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
-ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(PLATFORM_NAME));
+ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_iphoneminimalsimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
@@ -99,48 +101,65 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
 
 ENABLE_CUSTOM_SCHEME_HANDLER = ;
 
-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
 
 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 
 ENABLE_DATALIST_ELEMENT = ;
 
-ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
+ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
 
-ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_COCOA_TOUCH));
-ENABLE_DEVICE_ORIENTATION_cocoatouch = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
+ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION;
 
-ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
 
 ENABLE_EXTRA_ZOOM_MODE = ;
 
-ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(PLATFORM_NAME));
+ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
+ENABLE_FAST_JIT_PERMISSIONS_iphoneminimalsimulator = ENABLE_FAST_JIT_PERMISSIONS;
 
 ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
 
-ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME))
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneminimalsimulator = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
 
-ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
+ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(WK_PLATFORM_NAME));
 ENABLE_FULLSCREEN_API_iphoneos = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_iphonesimulator = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_IOS_SINCE_12 = ENABLE_FULLSCREEN_API;
 ENABLE_FULLSCREEN_API_macosx = ENABLE_FULLSCREEN_API;
 
-ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(PLATFORM_NAME));
+ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD_iphoneminimalsimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
@@ -148,17 +167,17 @@ ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
 
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 
-ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
+ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
 
-ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_macosx = ENABLE_INPUT_TYPE_COLOR;
 
-ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_POPOVER_macosx = ENABLE_INPUT_TYPE_COLOR_POPOVER;
 
 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
@@ -200,15 +219,22 @@ ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
 
 ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER = ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER;
 
-ENABLE_LEGACY_ENCRYPTED_MEDIA = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA = $(ENABLE_LEGACY_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_macosx = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 
 ENABLE_LETTERPRESS = $(ENABLE_LETTERPRESS_$(WK_COCOA_TOUCH));
 ENABLE_LETTERPRESS_cocoatouch = ENABLE_LETTERPRESS;
 
-ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
-ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_VIDEO_TOOLBOX_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_VIDEO_TOOLBOX;
 
 ENABLE_MATHML = ENABLE_MATHML;
@@ -220,18 +246,25 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SESSION = ;
 
-ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(PLATFORM_NAME));
+ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
 
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME));
+ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
 ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
 
 ENABLE_MHTML = ;
 
-ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(PLATFORM_NAME));
+ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
@@ -239,15 +272,15 @@ ENABLE_NAVIGATOR_CONTENT_UTILS = ;
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
-ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
+ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
 ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
 
-ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
+ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(WK_PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
 
-ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(PLATFORM_NAME));
+ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
 ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
@@ -260,15 +293,22 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 
 ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
 
-ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(PLATFORM_NAME));
+ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
-ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
 ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
 
-ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
+ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
 
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 
@@ -289,16 +329,18 @@ ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
 
 ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
 
-ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
+ENABLE_VARIATION_FONTS_iphoneminimalsimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
 ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(PLATFORM_NAME));
+ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
@@ -309,7 +351,7 @@ ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
-ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(PLATFORM_NAME));
+ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_macosx = ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN;
 
 ENABLE_WEBASSEMBLY = ;
@@ -318,7 +360,7 @@ ENABLE_WEBGL = ENABLE_WEBGL;
 
 ENABLE_WEBGL2 = ENABLE_WEBGL2;
 
-ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(PLATFORM_NAME));
+ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
@@ -326,12 +368,12 @@ ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
 
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 
-ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(PLATFORM_NAME));
+ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME));
 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_macosx[arch=x86_64] = ENABLE_WEB_AUTHN;
 
-ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(PLATFORM_NAME));
+ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME));
 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_macosx[arch=x86_64] = ENABLE_WEB_RTC;
index 1585c66..cf0b46d 100644 (file)
@@ -1,3 +1,13 @@
+2018-03-20  Tim Horton  <timothy_horton@apple.com>
+
+        Add and adopt WK_PLATFORM_NAME and adjust default feature defines
+        https://bugs.webkit.org/show_bug.cgi?id=183758
+        <rdar://problem/38017644>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2018-03-19  Megan Gardner  <megan_gardner@apple.com>
 
         Clear style colors when setting default appearance
index 152c323..a1e7e92 100644 (file)
@@ -118,3 +118,13 @@ SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index 3b0da2b..1f4e8fc 100644 (file)
@@ -33,8 +33,9 @@
 
 #include "WebKitTargetConditionals.xcconfig"
 
-WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(PLATFORM_NAME));
+WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
 WK_COCOA_TOUCH_iphoneos = cocoatouch;
+WK_COCOA_TOUCH_iphoneminimalsimulator = cocoatouch;
 WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
 WK_COCOA_TOUCH_watchos = cocoatouch;
 WK_COCOA_TOUCH_watchsimulator = cocoatouch;
@@ -48,13 +49,13 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING = $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_$(WK_COCOA_TOUCH));
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
 
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_macosx = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
@@ -70,8 +71,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 
 ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
-ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(PLATFORM_NAME));
+ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_iphoneminimalsimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
@@ -99,48 +101,65 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
 
 ENABLE_CUSTOM_SCHEME_HANDLER = ;
 
-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
 
 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 
 ENABLE_DATALIST_ELEMENT = ;
 
-ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
+ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
 
-ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_COCOA_TOUCH));
-ENABLE_DEVICE_ORIENTATION_cocoatouch = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
+ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION;
 
-ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
 
 ENABLE_EXTRA_ZOOM_MODE = ;
 
-ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(PLATFORM_NAME));
+ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
+ENABLE_FAST_JIT_PERMISSIONS_iphoneminimalsimulator = ENABLE_FAST_JIT_PERMISSIONS;
 
 ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
 
-ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME))
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneminimalsimulator = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
 
-ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
+ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(WK_PLATFORM_NAME));
 ENABLE_FULLSCREEN_API_iphoneos = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_iphonesimulator = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_IOS_SINCE_12 = ENABLE_FULLSCREEN_API;
 ENABLE_FULLSCREEN_API_macosx = ENABLE_FULLSCREEN_API;
 
-ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(PLATFORM_NAME));
+ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD_iphoneminimalsimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
@@ -148,17 +167,17 @@ ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
 
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 
-ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
+ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
 
-ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_macosx = ENABLE_INPUT_TYPE_COLOR;
 
-ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_POPOVER_macosx = ENABLE_INPUT_TYPE_COLOR_POPOVER;
 
 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
@@ -200,15 +219,22 @@ ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
 
 ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER = ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER;
 
-ENABLE_LEGACY_ENCRYPTED_MEDIA = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA = $(ENABLE_LEGACY_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_macosx = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 
 ENABLE_LETTERPRESS = $(ENABLE_LETTERPRESS_$(WK_COCOA_TOUCH));
 ENABLE_LETTERPRESS_cocoatouch = ENABLE_LETTERPRESS;
 
-ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
-ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_VIDEO_TOOLBOX_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_VIDEO_TOOLBOX;
 
 ENABLE_MATHML = ENABLE_MATHML;
@@ -220,18 +246,25 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SESSION = ;
 
-ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(PLATFORM_NAME));
+ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
 
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME));
+ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
 ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
 
 ENABLE_MHTML = ;
 
-ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(PLATFORM_NAME));
+ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
@@ -239,15 +272,15 @@ ENABLE_NAVIGATOR_CONTENT_UTILS = ;
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
-ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
+ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
 ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
 
-ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
+ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(WK_PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
 
-ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(PLATFORM_NAME));
+ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
 ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
@@ -260,15 +293,22 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 
 ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
 
-ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(PLATFORM_NAME));
+ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
-ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
 ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
 
-ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
+ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
 
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 
@@ -289,16 +329,18 @@ ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
 
 ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
 
-ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
+ENABLE_VARIATION_FONTS_iphoneminimalsimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
 ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(PLATFORM_NAME));
+ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
@@ -309,7 +351,7 @@ ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
-ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(PLATFORM_NAME));
+ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_macosx = ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN;
 
 ENABLE_WEBASSEMBLY = ;
@@ -318,7 +360,7 @@ ENABLE_WEBGL = ENABLE_WEBGL;
 
 ENABLE_WEBGL2 = ENABLE_WEBGL2;
 
-ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(PLATFORM_NAME));
+ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
@@ -326,9 +368,12 @@ ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
 
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 
-ENABLE_WEB_AUTHN = ;
+ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME));
+ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN;
+ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN;
+ENABLE_WEB_AUTHN_macosx[arch=x86_64] = ENABLE_WEB_AUTHN;
 
-ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(PLATFORM_NAME));
+ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME));
 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_macosx[arch=x86_64] = ENABLE_WEB_RTC;
index 2fc9ba5..177975a 100644 (file)
@@ -1,3 +1,13 @@
+2018-03-20  Tim Horton  <timothy_horton@apple.com>
+
+        Add and adopt WK_PLATFORM_NAME and adjust default feature defines
+        https://bugs.webkit.org/show_bug.cgi?id=183758
+        <rdar://problem/38017644>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/Base.xcconfig:
+
 2018-03-16  Filip Pizlo  <fpizlo@apple.com>
 
         Put the DOM in IsoHeaps
index 939c7d5..4953b03 100644 (file)
@@ -131,3 +131,7 @@ WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_
 
 BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 BMALLOC_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index a62ef8b..ed6993d 100644 (file)
@@ -1,3 +1,13 @@
+2018-03-20  Tim Horton  <timothy_horton@apple.com>
+
+        Add and adopt WK_PLATFORM_NAME and adjust default feature defines
+        https://bugs.webkit.org/show_bug.cgi?id=183758
+        <rdar://problem/38017644>
+
+        Reviewed by Dan Bernstein.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
 2018-03-20  Chris Dumez  <cdumez@apple.com>
 
         Unreviewed, rolling out r229726 and r229763.
index 549686d..888b334 100644 (file)
@@ -99,3 +99,13 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iphoneminimalsimulator;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
index dc66f4a..1f4e8fc 100644 (file)
@@ -33,8 +33,9 @@
 
 #include "WebKitTargetConditionals.xcconfig"
 
-WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(PLATFORM_NAME));
+WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
 WK_COCOA_TOUCH_iphoneos = cocoatouch;
+WK_COCOA_TOUCH_iphoneminimalsimulator = cocoatouch;
 WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
 WK_COCOA_TOUCH_watchos = cocoatouch;
 WK_COCOA_TOUCH_watchsimulator = cocoatouch;
@@ -48,13 +49,13 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING = $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_$(WK_COCOA_TOUCH));
 ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
 
-ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
 
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
 ENABLE_APPLE_PAY_SESSION_V3_macosx = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
@@ -70,8 +71,9 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 
 ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
-ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(PLATFORM_NAME));
+ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_iphoneminimalsimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
@@ -99,48 +101,65 @@ ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
 
 ENABLE_CUSTOM_SCHEME_HANDLER = ;
 
-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
 
 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 
 ENABLE_DATALIST_ELEMENT = ;
 
-ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
+ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
 
-ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_COCOA_TOUCH));
-ENABLE_DEVICE_ORIENTATION_cocoatouch = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
+ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION;
+ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION;
 
-ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
 ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
 
 ENABLE_EXTRA_ZOOM_MODE = ;
 
-ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(PLATFORM_NAME));
+ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK));
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
+ENABLE_FAST_JIT_PERMISSIONS_iphoneminimalsimulator = ENABLE_FAST_JIT_PERMISSIONS;
 
 ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
 
-ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME))
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
+ENABLE_FTL_JIT_iphoneminimalsimulator = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_watchos = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_appletvos = ENABLE_FTL_JIT;
 
-ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
+ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(WK_PLATFORM_NAME));
 ENABLE_FULLSCREEN_API_iphoneos = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_iphonesimulator = $(ENABLE_FULLSCREEN_API$(WK_IOS_12));
 ENABLE_FULLSCREEN_API_IOS_SINCE_12 = ENABLE_FULLSCREEN_API;
 ENABLE_FULLSCREEN_API_macosx = ENABLE_FULLSCREEN_API;
 
-ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(PLATFORM_NAME));
+ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME));
 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD;
+ENABLE_GAMEPAD_iphoneminimalsimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD;
@@ -148,17 +167,17 @@ ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
 
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 
-ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
+ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(WK_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
 
-ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR = $(ENABLE_INPUT_TYPE_COLOR_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_macosx = ENABLE_INPUT_TYPE_COLOR;
 
-ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(PLATFORM_NAME));
+ENABLE_INPUT_TYPE_COLOR_POPOVER = $(ENABLE_INPUT_TYPE_COLOR_POPOVER_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_COLOR_POPOVER_macosx = ENABLE_INPUT_TYPE_COLOR_POPOVER;
 
 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
@@ -200,15 +219,22 @@ ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
 
 ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER = ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER;
 
-ENABLE_LEGACY_ENCRYPTED_MEDIA = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA = $(ENABLE_LEGACY_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_watchsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
+ENABLE_LEGACY_ENCRYPTED_MEDIA_macosx = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 
 ENABLE_LETTERPRESS = $(ENABLE_LETTERPRESS_$(WK_COCOA_TOUCH));
 ENABLE_LETTERPRESS_cocoatouch = ENABLE_LETTERPRESS;
 
-ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS = $(ENABLE_MAC_GESTURE_EVENTS_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
-ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_VIDEO_TOOLBOX = $(ENABLE_MAC_VIDEO_TOOLBOX_$(WK_PLATFORM_NAME)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_MAC_VIDEO_TOOLBOX_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_VIDEO_TOOLBOX;
 
 ENABLE_MATHML = ENABLE_MATHML;
@@ -220,18 +246,25 @@ ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
 
 ENABLE_MEDIA_SESSION = ;
 
-ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(PLATFORM_NAME));
+ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
 
 ENABLE_MEDIA_STATISTICS = ;
 
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME));
+ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_watchsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvos = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_appletvsimulator = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
 ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
 
 ENABLE_MHTML = ;
 
-ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(PLATFORM_NAME));
+ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
@@ -239,15 +272,15 @@ ENABLE_NAVIGATOR_CONTENT_UTILS = ;
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
-ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
+ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
 ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
 
-ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
+ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(WK_PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
 
-ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(PLATFORM_NAME));
+ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
 ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
@@ -260,15 +293,22 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 
 ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
 
-ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(PLATFORM_NAME));
+ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
-ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
 ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
 
-ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
+ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS;
+ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
 
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 
@@ -289,16 +329,18 @@ ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
 
 ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
 
-ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS = $(ENABLE_VARIATION_FONTS_$(WK_PLATFORM_NAME));
 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
+ENABLE_VARIATION_FONTS_iphoneminimalsimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_macosx = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
 ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(PLATFORM_NAME));
+ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
@@ -309,7 +351,7 @@ ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
-ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(PLATFORM_NAME));
+ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_macosx = ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN;
 
 ENABLE_WEBASSEMBLY = ;
@@ -318,7 +360,7 @@ ENABLE_WEBGL = ENABLE_WEBGL;
 
 ENABLE_WEBGL2 = ENABLE_WEBGL2;
 
-ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(PLATFORM_NAME));
+ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
@@ -326,12 +368,12 @@ ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
 
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 
-ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(PLATFORM_NAME));
+ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME));
 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN;
 ENABLE_WEB_AUTHN_macosx[arch=x86_64] = ENABLE_WEB_AUTHN;
 
-ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(PLATFORM_NAME));
+ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME));
 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
 ENABLE_WEB_RTC_macosx[arch=x86_64] = ENABLE_WEB_RTC;