Unreviewed, rolling out r256091.
authortsavell@apple.com <tsavell@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Feb 2020 17:28:29 +0000 (17:28 +0000)
committertsavell@apple.com <tsavell@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Feb 2020 17:28:29 +0000 (17:28 +0000)
Broke internal builds

Reverted changeset:

"Move trivial definitions from FeatureDefines.xcconfig to
PlatformEnableCocoa.h"
https://bugs.webkit.org/show_bug.cgi?id=207155
https://trac.webkit.org/changeset/256091

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

26 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/JavaScriptCore/DerivedSources.make
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformEnable.h
Source/WTF/wtf/PlatformEnableCocoa.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/DerivedSources.make
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/Configurations/PAL.xcconfig
Source/WebCore/Scripts/generate-unified-sources.sh
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebKit/ChangeLog
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKit/DerivedSources.make
Source/WebKit/Scripts/generate-unified-sources.sh
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Source/WebKitLegacy/mac/MigrateHeaders.make
Source/WebKitLegacy/scripts/generate-unified-sources.sh
Tools/ChangeLog
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index 776b4bf..901aa89 100644 (file)
@@ -1,5 +1,18 @@
 2020-02-10  Truitt Savell  <tsavell@apple.com>
 
+        Unreviewed, rolling out r256091.
+
+        Broke internal builds
+
+        Reverted changeset:
+
+        "Move trivial definitions from FeatureDefines.xcconfig to
+        PlatformEnableCocoa.h"
+        https://bugs.webkit.org/show_bug.cgi?id=207155
+        https://trac.webkit.org/changeset/256091
+
+2020-02-10  Truitt Savell  <tsavell@apple.com>
+
         Unreviewed, rolling out r256103.
 
         This patch is blocking the rollout of r256091
index 7c79b3d..f4d26e3 100644 (file)
 
 #include "WebKitTargetConditionals.xcconfig"
 
+ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
+
+ENABLE_ACCELERATED_2D_CANVAS = ;
+
 ENABLE_ACCESSIBILITY_ISOLATED_TREE = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE_$(WK_PLATFORM_NAME));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_macosx = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE$(WK_MACOS_1016));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_MACOS_SINCE_1016 = ENABLE_ACCESSIBILITY_ISOLATED_TREE;
@@ -61,6 +65,16 @@ ENABLE_APPLE_PAY_SESSION_V9_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V9;
 ENABLE_APPLE_PAY_SESSION_V9_macosx = $(ENABLE_APPLE_PAY_SESSION_V9$(WK_MACOS_1015));
 ENABLE_APPLE_PAY_SESSION_V9_MACOS_SINCE_1015 = ENABLE_APPLE_PAY_SESSION_V9;
 
+ENABLE_APPLICATION_MANIFEST = ENABLE_APPLICATION_MANIFEST;
+
+ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+
+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
+
+ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
+
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
+
 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -71,6 +85,12 @@ ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
 // FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
 ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
+ENABLE_CSS3_TEXT = ;
+
+ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
+
+ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
+
 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME));
 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS;
@@ -83,12 +103,34 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
+ENABLE_CSS_DEVICE_ADAPTATION = ;
+
+ENABLE_CSS_IMAGE_RESOLUTION = ;
+
+ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
+
+ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
+
+ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+
+ENABLE_CSS_TRAILING_WORD = ENABLE_CSS_TRAILING_WORD;
+
+ENABLE_CSS_TYPED_OM = ENABLE_CSS_TYPED_OM;
+
+ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
+
+ENABLE_CUSTOM_SCHEME_HANDLER = ;
+
 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
 
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
+
+ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT;
+
 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
@@ -125,6 +167,8 @@ ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSION
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
 ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
 
+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
+
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
@@ -152,6 +196,14 @@ ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
 
+ENABLE_GPU_PROCESS = ENABLE_GPU_PROCESS;
+
+ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
+
+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
+
+ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
+
 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
@@ -184,12 +236,26 @@ ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
 
+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
+
+ENABLE_INSPECTOR_TELEMETRY = ENABLE_INSPECTOR_TELEMETRY;
+
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
+
+ENABLE_INTL = ENABLE_INTL;
+
 ENABLE_IOS_GESTURE_EVENTS = $(ENABLE_IOS_GESTURE_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_GESTURE_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_IOS_TOUCH_EVENTS = $(ENABLE_IOS_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
 
+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
+
+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_$(WK_PLATFORM_NAME));
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
@@ -208,29 +274,51 @@ ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVEN
 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;
+
 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH));
 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE;
 
+ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
+
+ENABLE_MEDIA_SESSION = ;
+
 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_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
+ENABLE_MEMORY_SAMPLER = ENABLE_MEMORY_SAMPLER;
+
+ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
+
+ENABLE_MHTML = ;
+
 ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
+ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION = ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION;
+
+ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE = ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE;
+
 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
+ENABLE_OFFSCREEN_CANVAS = ;
+
 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH));
 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH;
 
+ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
+
 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME));
 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API;
 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API;
@@ -253,12 +341,34 @@ ENABLE_POINTER_EVENTS_watchsimulator[sdk=watch*5.*] = ;
 ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
+ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
+
+ENABLE_QUOTA = ;
+
+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
+
+ENABLE_RESIZE_OBSERVER = ENABLE_RESIZE_OBSERVER;
+
+ENABLE_RESOLUTION_MEDIA_QUERY = ;
+
+ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+
+ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
+
 ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
+ENABLE_SANDBOX_EXTENSIONS = ENABLE_SANDBOX_EXTENSIONS;
+
+ENABLE_SERVER_PRECONNECT = ENABLE_SERVER_PRECONNECT;
+
 ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
+ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
+
+ENABLE_SHAREABLE_RESOURCE = ENABLE_SHAREABLE_RESOURCE;
+
 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
@@ -268,20 +378,50 @@ 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;
+
+ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
+
+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
+
+ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
+
 // FIXME: Remove the USE_INTERNAL_SDK condition once we support touch events when building for iOS with
 // the public SDK. See <https://webkit.org/b/179167>.
 ENABLE_TOUCH_EVENTS = $(ENABLE_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_TOUCH_EVENTS;
 
+ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
+
+ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
+
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
+
+ENABLE_VIDEO = ENABLE_VIDEO;
+
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
+
+ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+
 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 = ;
+
+ENABLE_WEBASSEMBLY_STREAMING_API = ;
+
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS = $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_macosx = ENABLE_WEBDRIVER_MOUSE_INTERACTIONS;
 
+ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS = ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS;
+
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS;
 
+ENABLE_WEBGL = ENABLE_WEBGL;
+
+ENABLE_WEBGL2 = ENABLE_WEBGL2;
+
 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11));
 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU;
@@ -290,14 +430,24 @@ ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014));
 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU;
 
+ENABLE_WEB_API_STATISTICS = ;
+
+ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
+
 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 = ENABLE_WEB_AUTHN;
 
+ENABLE_WEB_CRYPTO = ENABLE_WEB_CRYPTO;
+
 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 = ENABLE_WEB_RTC;
 
-FEATURE_DEFINES = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CONTENT_FILTERING) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STREAM) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
+
+ENABLE_XSLT = ENABLE_XSLT;
+
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index a1555eb..e2a36fa 100644 (file)
@@ -264,31 +264,16 @@ INSPECTOR_DOMAINS := \
     $(JavaScriptCore)/inspector/protocol/Worker.json \
 #
 
-
-FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
-HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
-
-ifneq ($(SDKROOT),)
-    SDK_FLAGS=-isysroot $(SDKROOT)
-endif
-
-ifeq ($(USE_LLVM_TARGET_TRIPLES_FOR_CLANG),YES)
-    WK_CURRENT_ARCH=$(word 1, $(ARCHS))
-    TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
-endif
-
-ENABLED_FEATURES = $(shell $(CC) -std=$(CLANG_CXX_LANGUAGE_STANDARD) -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(patsubst %, -D%, $(FEATURE_DEFINES)) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep '\#define ENABLE_.* 1' | cut -d' ' -f2)
-
-ifeq ($(findstring ENABLE_INDEXED_DATABASE,$(ENABLED_FEATURES)), ENABLE_INDEXED_DATABASE)
+ifeq ($(findstring ENABLE_INDEXED_DATABASE,$(FEATURE_DEFINES)), ENABLE_INDEXED_DATABASE)
     INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/IndexedDB.json
 endif
 
-ifeq ($(findstring ENABLE_RESOURCE_USAGE,$(ENABLED_FEATURES)), ENABLE_RESOURCE_USAGE)
+ifeq ($(findstring ENABLE_RESOURCE_USAGE,$(FEATURE_DEFINES)), ENABLE_RESOURCE_USAGE)
     INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/CPUProfiler.json
     INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/Memory.json
 endif
 
-ifeq ($(findstring ENABLE_SERVICE_WORKER,$(ENABLED_FEATURES)), ENABLE_SERVICE_WORKER)
+ifeq ($(findstring ENABLE_SERVICE_WORKER,$(FEATURE_DEFINES)), ENABLE_SERVICE_WORKER)
     INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/ServiceWorker.json
 endif
 
index fbd26ea..7f6a358 100644 (file)
@@ -1,5 +1,18 @@
 2020-02-10  Truitt Savell  <tsavell@apple.com>
 
+        Unreviewed, rolling out r256091.
+
+        Broke internal builds
+
+        Reverted changeset:
+
+        "Move trivial definitions from FeatureDefines.xcconfig to
+        PlatformEnableCocoa.h"
+        https://bugs.webkit.org/show_bug.cgi?id=207155
+        https://trac.webkit.org/changeset/256091
+
+2020-02-10  Truitt Savell  <tsavell@apple.com>
+
         Unreviewed, rolling out r256103.
 
         This patch is blocking the rollout of r256091
index c76fc52..fede24b 100644 (file)
 
 /* Do not use PLATFORM() tests in this section ! */
 
-#if !defined(ENABLE_APPLICATION_MANIFEST)
-#define ENABLE_APPLICATION_MANIFEST 0
-#endif
-
-#if !defined(ENABLE_ATTACHMENT_ELEMENT)
-#define ENABLE_ATTACHMENT_ELEMENT 0
-#endif
-
-#if !defined(ENABLE_AVF_CAPTIONS)
-#define ENABLE_AVF_CAPTIONS 0
-#endif
-
-#if !defined(ENABLE_CACHE_PARTITIONING)
-#define ENABLE_CACHE_PARTITIONING 0
-#endif
-
-#if !defined(ENABLE_CSS_PAINTING_API)
-#define ENABLE_CSS_PAINTING_API 0
-#endif
-
-#if !defined(ENABLE_CSS_SCROLL_SNAP)
-#define ENABLE_CSS_SCROLL_SNAP 0
-#endif
-
-#if !defined(ENABLE_CSS_SELECTORS_LEVEL4)
-#define ENABLE_CSS_SELECTORS_LEVEL4 0
-#endif
-
-#if !defined(ENABLE_CSS_TRAILING_WORD)
-#define ENABLE_CSS_TRAILING_WORD 0
-#endif
-
-#if !defined(ENABLE_CSS_TYPED_OM)
-#define ENABLE_CSS_TYPED_OM 0
-#endif
-
-#if !defined(ENABLE_GPU_PROCESS)
-#define ENABLE_GPU_PROCESS 0
-#endif
-
-#if !defined(ENABLE_INTERSECTION_OBSERVER)
-#define ENABLE_INTERSECTION_OBSERVER 0
-#endif
-
-#if !defined(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER)
-#define ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER 0
-#endif
-
-#if !defined(ENABLE_MEMORY_SAMPLER)
-#define ENABLE_MEMORY_SAMPLER 0
-#endif
-
-#if !defined(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION)
-#define ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION 0
-#endif
-
-#if !defined(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE)
-#define ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE 0
-#endif
-
-#if !defined(ENABLE_PUBLIC_SUFFIX_LIST)
-#define ENABLE_PUBLIC_SUFFIX_LIST 0
-#endif
-
-#if !defined(ENABLE_RESIZE_OBSERVER)
-#define ENABLE_RESIZE_OBSERVER 0
-#endif
-
-#if !defined(ENABLE_RESOURCE_LOAD_STATISTICS)
-#define ENABLE_RESOURCE_LOAD_STATISTICS 0
-#endif
-
-/* FIXME: This should be a HAVE_* macro. */
-#if !defined(ENABLE_SANDBOX_EXTENSIONS)
-#define ENABLE_SANDBOX_EXTENSIONS 0
-#endif
-
-#if !defined(ENABLE_SERVER_PRECONNECT)
-#define ENABLE_SERVER_PRECONNECT 0
-#endif
-
-#if !defined(ENABLE_SHAREABLE_RESOURCE)
-#define ENABLE_SHAREABLE_RESOURCE 0
-#endif
-
-#if !defined(ENABLE_TELEPHONE_NUMBER_DETECTION)
-#define ENABLE_TELEPHONE_NUMBER_DETECTION 0
-#endif
-
-#if !defined(ENABLE_USERSELECT_ALL)
-#define ENABLE_USERSELECT_ALL 0
-#endif
-
-#if !defined(ENABLE_USER_MESSAGE_HANDLERS)
-#define ENABLE_USER_MESSAGE_HANDLERS 0
-#endif
-
-#if !defined(ENABLE_VARIATION_FONTS)
-#define ENABLE_VARIATION_FONTS 0
-#endif
-
-#if !defined(ENABLE_VIDEO_PRESENTATION_MODE)
-#define ENABLE_VIDEO_PRESENTATION_MODE 0
-#endif
-
-#if !defined(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS)
-#define ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS 0
-#endif
-
-#if !defined(ENABLE_WEB_CRYPTO)
-#define ENABLE_WEB_CRYPTO 0
-#endif
-
-#if !defined(ENABLE_WIRELESS_PLAYBACK_TARGET)
-#define ENABLE_WIRELESS_PLAYBACK_TARGET 0
-#endif
-
-#if !defined(ENABLE_MEDIA_SESSION)
-#define ENABLE_MEDIA_SESSION 0
-#endif
-
-#if !defined(ENABLE_MEDIA_SESSION)
-#define ENABLE_MEDIA_SESSION 0
-#endif
-
-#if !defined(ENABLE_RESOLUTION_MEDIA_QUERY)
-#define ENABLE_RESOLUTION_MEDIA_QUERY 0
-#endif
-
-#if !defined(ENABLE_WEB_API_STATISTICS)
-#define ENABLE_WEB_API_STATISTICS 0
-#endif
-
 #if !defined(ENABLE_WEBPROCESS_NSRUNLOOP)
 #define ENABLE_WEBPROCESS_NSRUNLOOP 0
 #endif
 #define ENABLE_GRAPHICS_CONTEXT_GL ENABLE_WEBGL
 #endif
 
-#if !defined(ENABLE_WEBGL2)
-#define ENABLE_WEBGL2 0
-#endif
-
 #if !defined(ENABLE_WEB_ARCHIVE)
 #define ENABLE_WEB_ARCHIVE 0
 #endif
 #define ENABLE_WEBASSEMBLY 1
 #endif
 
-#if !defined(WEBASSEMBLY_STREAMING_API)
-#define WEBASSEMBLY_STREAMING_API 0
-#endif
-
-
 /* The SamplingProfiler is the probabilistic and low-overhead profiler used by
  * JSC to measure where time is spent inside a JavaScript program.
  * In configurations other than Windows and Darwin, because layout of mcontext_t depends on standard libraries (like glibc),
index de8ab1d..172c8ef 100644 (file)
@@ -75,7 +75,7 @@
 #define ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS 1
 #endif
 
-#if !defined(ENABLE_INSPECTOR_TELEMETRY)
+#if !defined(ENABLE_INSPECTOR_TELEMETRY) && PLATFORM(MAC)
 #define ENABLE_INSPECTOR_TELEMETRY 1
 #endif
 
 #define ENABLE_IOS_TOUCH_EVENTS 1
 #endif
 
-#if !defined(ENABLE_TEXT_AUTOSIZING)
+#if !defined(ENABLE_TEXT_AUTOSIZING) && PLATFORM(IOS_FAMILY)
 #define ENABLE_TEXT_AUTOSIZING 1
 #endif
 
-#if !defined(ENABLE_METER_ELEMENT)
-#define ENABLE_METER_ELEMENT 1
+#if !defined(ENABLE_METER_ELEMENT) && PLATFORM(IOS_FAMILY)
+#define ENABLE_METER_ELEMENT 0
 #endif
 
 #if !defined(ENABLE_NETSCAPE_PLUGIN_API) && PLATFORM(IOS_FAMILY)
 #define ENABLE_WEB_ARCHIVE 1
 #endif
 
-#if !defined(ENABLE_WEBGL)
+#if !defined(ENABLE_WEBGL) && PLATFORM(IOS_FAMILY)
 #define ENABLE_WEBGL 1
 #endif
 
 #define ENABLE_SMOOTH_SCROLLING 1
 #endif
 
-#if !defined(ENABLE_CURSOR_VISIBILITY)
+#if !defined(ENABLE_VIDEO_TRACK) && PLATFORM(MAC) && ENABLE(VIDEO)
+#define ENABLE_VIDEO_TRACK 1
+#endif
+
+#if !defined(ENABLE_WEB_AUDIO) && PLATFORM(MAC)
+#define ENABLE_WEB_AUDIO 1
+#endif
+
+#if !defined(ENABLE_CURSOR_VISIBILITY) && PLATFORM(MAC)
 #define ENABLE_CURSOR_VISIBILITY 1
 #endif
 
 #if !defined(ENABLE_DATA_DETECTION) && (!PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST))
 #define ENABLE_DATA_DETECTION 1
 #endif
-
-#if !defined(ENABLE_3D_TRANSFORMS)
-#define ENABLE_3D_TRANSFORMS 1
-#endif
-
-#if !defined(ENABLE_APPLICATION_MANIFEST)
-#define ENABLE_APPLICATION_MANIFEST 1
-#endif
-
-#if !defined(ENABLE_ATTACHMENT_ELEMENT)
-#define ENABLE_ATTACHMENT_ELEMENT 1
-#endif
-
-#if !defined(ENABLE_AVF_CAPTIONS)
-#define ENABLE_AVF_CAPTIONS 1
-#endif
-
-#if !defined(ENABLE_CACHE_PARTITIONING)
-#define ENABLE_CACHE_PARTITIONING 1
-#endif
-
-#if !defined(ENABLE_CHANNEL_MESSAGING)
-#define ENABLE_CHANNEL_MESSAGING 1
-#endif
-
-#if !defined(ENABLE_CSS_COMPOSITING)
-#define ENABLE_CSS_COMPOSITING 1
-#endif
-
-#if !defined(ENABLE_CSS_PAINTING_API)
-#define ENABLE_CSS_PAINTING_API 1
-#endif
-
-#if !defined(ENABLE_CSS_SCROLL_SNAP)
-#define ENABLE_CSS_SCROLL_SNAP 1
-#endif
-
-#if !defined(ENABLE_CSS_SELECTORS_LEVEL4)
-#define ENABLE_CSS_SELECTORS_LEVEL4 1
-#endif
-
-#if !defined(ENABLE_CSS_TRAILING_WORD)
-#define ENABLE_CSS_TRAILING_WORD 1
-#endif
-
-#if !defined(ENABLE_CSS_TYPED_OM)
-#define ENABLE_CSS_TYPED_OM 1
-#endif
-
-#if !defined(ENABLE_DATACUE_VALUE)
-#define ENABLE_DATACUE_VALUE 1
-#endif
-
-#if !defined(ENABLE_DATALIST_ELEMENT)
-#define ENABLE_DATALIST_ELEMENT 1
-#endif
-
-#if !defined(ENABLE_FILTERS_LEVEL_2)
-#define ENABLE_FILTERS_LEVEL_2 1
-#endif
-
-#if !defined(ENABLE_GPU_PROCESS)
-#define ENABLE_GPU_PROCESS 1
-#endif
-
-#if !defined(ENABLE_INDEXED_DATABASE)
-#define ENABLE_INDEXED_DATABASE 1
-#endif
-
-#if !defined(ENABLE_INDEXED_DATABASE_IN_WORKERS)
-#define ENABLE_INDEXED_DATABASE_IN_WORKERS 1
-#endif
-
-#if !defined(ENABLE_INPUT_TYPE_COLOR)
-#define ENABLE_INPUT_TYPE_COLOR 1
-#endif
-
-#if !defined(ENABLE_INTERSECTION_OBSERVER)
-#define ENABLE_INTERSECTION_OBSERVER 1
-#endif
-
-#if !defined(ENABLE_INTL)
-#define ENABLE_INTL 1
-#endif
-
-#if !defined(ENABLE_LAYOUT_FORMATTING_CONTEXT)
-#define ENABLE_LAYOUT_FORMATTING_CONTEXT 1
-#endif
-
-#if !defined(ENABLE_LEGACY_CSS_VENDOR_PREFIXES)
-#define ENABLE_LEGACY_CSS_VENDOR_PREFIXES 1
-#endif
-
-#if !defined(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER)
-#define ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER 1
-#endif
-
-#if !defined(ENABLE_MATHML)
-#define ENABLE_MATHML 1
-#endif
-
-#if !defined(ENABLE_MEDIA_CONTROLS_SCRIPT)
-#define ENABLE_MEDIA_CONTROLS_SCRIPT 1
-#endif
-
-#if !defined(ENABLE_MEMORY_SAMPLER)
-#define ENABLE_MEMORY_SAMPLER 1
-#endif
-
-#if !defined(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION)
-#define ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION 1
-#endif
-
-#if !defined(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE)
-#define ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE 1
-#endif
-
-#if !defined(ENABLE_PUBLIC_SUFFIX_LIST)
-#define ENABLE_PUBLIC_SUFFIX_LIST 1
-#endif
-
-#if !defined(ENABLE_RESIZE_OBSERVER)
-#define ENABLE_RESIZE_OBSERVER 1
-#endif
-
-#if !defined(ENABLE_RESOURCE_LOAD_STATISTICS)
-#define ENABLE_RESOURCE_LOAD_STATISTICS 1
-#endif
-
-#if !defined(ENABLE_SANDBOX_EXTENSIONS)
-#define ENABLE_SANDBOX_EXTENSIONS 1
-#endif
-
-#if !defined(ENABLE_SERVER_PRECONNECT)
-#define ENABLE_SERVER_PRECONNECT 1
-#endif
-
-#if !defined(ENABLE_SERVICE_WORKER)
-#define ENABLE_SERVICE_WORKER 1
-#endif
-
-#if !defined(ENABLE_SHAREABLE_RESOURCE)
-#define ENABLE_SHAREABLE_RESOURCE 1
-#endif
-
-#if !defined(ENABLE_STREAMS_API)
-#define ENABLE_STREAMS_API 1
-#endif
-
-#if !defined(ENABLE_SVG_FONTS)
-#define ENABLE_SVG_FONTS 1
-#endif
-
-#if !defined(ENABLE_TELEPHONE_NUMBER_DETECTION)
-#define ENABLE_TELEPHONE_NUMBER_DETECTION 1
-#endif
-
-#if !defined(ENABLE_USERSELECT_ALL)
-#define ENABLE_USERSELECT_ALL 1
-#endif
-
-#if !defined(ENABLE_USER_MESSAGE_HANDLERS)
-#define ENABLE_USER_MESSAGE_HANDLERS 1
-#endif
-
-#if !defined(ENABLE_VARIATION_FONTS)
-#define ENABLE_VARIATION_FONTS 1
-#endif
-
-#if !defined(ENABLE_VIDEO)
-#define ENABLE_VIDEO 1
-#endif
-
-#if !defined(ENABLE_VIDEO_PRESENTATION_MODE)
-#define ENABLE_VIDEO_PRESENTATION_MODE 1
-#endif
-
-#if !defined(ENABLE_VIDEO_TRACK)
-#define ENABLE_VIDEO_TRACK 1
-#endif
-
-#if !defined(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS)
-#define ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS 1
-#endif
-
-#if !defined(ENABLE_WEBGL2)
-#define ENABLE_WEBGL2 1
-#endif
-
-#if !defined(ENABLE_WEB_AUDIO)
-#define ENABLE_WEB_AUDIO 1
-#endif
-
-#if !defined(ENABLE_WEB_CRYPTO)
-#define ENABLE_WEB_CRYPTO 1
-#endif
-
-#if !defined(ENABLE_WIRELESS_PLAYBACK_TARGET)
-#define ENABLE_WIRELESS_PLAYBACK_TARGET 1
-#endif
-
-#if !defined(ENABLE_XSLT)
-#define ENABLE_XSLT 1
-#endif
index ee368c6..bceb52b 100644 (file)
@@ -1,5 +1,18 @@
 2020-02-10  Truitt Savell  <tsavell@apple.com>
 
+        Unreviewed, rolling out r256091.
+
+        Broke internal builds
+
+        Reverted changeset:
+
+        "Move trivial definitions from FeatureDefines.xcconfig to
+        PlatformEnableCocoa.h"
+        https://bugs.webkit.org/show_bug.cgi?id=207155
+        https://trac.webkit.org/changeset/256091
+
+2020-02-10  Truitt Savell  <tsavell@apple.com>
+
         Unreviewed, rolling out r256103.
 
         This patch is blocking the rollout of r256091
index 7c79b3d..f4d26e3 100644 (file)
 
 #include "WebKitTargetConditionals.xcconfig"
 
+ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
+
+ENABLE_ACCELERATED_2D_CANVAS = ;
+
 ENABLE_ACCESSIBILITY_ISOLATED_TREE = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE_$(WK_PLATFORM_NAME));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_macosx = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE$(WK_MACOS_1016));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_MACOS_SINCE_1016 = ENABLE_ACCESSIBILITY_ISOLATED_TREE;
@@ -61,6 +65,16 @@ ENABLE_APPLE_PAY_SESSION_V9_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V9;
 ENABLE_APPLE_PAY_SESSION_V9_macosx = $(ENABLE_APPLE_PAY_SESSION_V9$(WK_MACOS_1015));
 ENABLE_APPLE_PAY_SESSION_V9_MACOS_SINCE_1015 = ENABLE_APPLE_PAY_SESSION_V9;
 
+ENABLE_APPLICATION_MANIFEST = ENABLE_APPLICATION_MANIFEST;
+
+ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+
+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
+
+ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
+
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
+
 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -71,6 +85,12 @@ ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
 // FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
 ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
+ENABLE_CSS3_TEXT = ;
+
+ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
+
+ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
+
 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME));
 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS;
@@ -83,12 +103,34 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
+ENABLE_CSS_DEVICE_ADAPTATION = ;
+
+ENABLE_CSS_IMAGE_RESOLUTION = ;
+
+ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
+
+ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
+
+ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+
+ENABLE_CSS_TRAILING_WORD = ENABLE_CSS_TRAILING_WORD;
+
+ENABLE_CSS_TYPED_OM = ENABLE_CSS_TYPED_OM;
+
+ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
+
+ENABLE_CUSTOM_SCHEME_HANDLER = ;
+
 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
 
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
+
+ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT;
+
 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
@@ -125,6 +167,8 @@ ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSION
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
 ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
 
+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
+
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
@@ -152,6 +196,14 @@ ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
 
+ENABLE_GPU_PROCESS = ENABLE_GPU_PROCESS;
+
+ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
+
+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
+
+ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
+
 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
@@ -184,12 +236,26 @@ ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
 
+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
+
+ENABLE_INSPECTOR_TELEMETRY = ENABLE_INSPECTOR_TELEMETRY;
+
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
+
+ENABLE_INTL = ENABLE_INTL;
+
 ENABLE_IOS_GESTURE_EVENTS = $(ENABLE_IOS_GESTURE_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_GESTURE_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_IOS_TOUCH_EVENTS = $(ENABLE_IOS_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
 
+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
+
+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_$(WK_PLATFORM_NAME));
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
@@ -208,29 +274,51 @@ ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVEN
 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;
+
 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH));
 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE;
 
+ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
+
+ENABLE_MEDIA_SESSION = ;
+
 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_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
+ENABLE_MEMORY_SAMPLER = ENABLE_MEMORY_SAMPLER;
+
+ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
+
+ENABLE_MHTML = ;
+
 ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
+ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION = ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION;
+
+ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE = ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE;
+
 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
+ENABLE_OFFSCREEN_CANVAS = ;
+
 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH));
 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH;
 
+ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
+
 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME));
 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API;
 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API;
@@ -253,12 +341,34 @@ ENABLE_POINTER_EVENTS_watchsimulator[sdk=watch*5.*] = ;
 ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
+ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
+
+ENABLE_QUOTA = ;
+
+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
+
+ENABLE_RESIZE_OBSERVER = ENABLE_RESIZE_OBSERVER;
+
+ENABLE_RESOLUTION_MEDIA_QUERY = ;
+
+ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+
+ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
+
 ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
+ENABLE_SANDBOX_EXTENSIONS = ENABLE_SANDBOX_EXTENSIONS;
+
+ENABLE_SERVER_PRECONNECT = ENABLE_SERVER_PRECONNECT;
+
 ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
+ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
+
+ENABLE_SHAREABLE_RESOURCE = ENABLE_SHAREABLE_RESOURCE;
+
 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
@@ -268,20 +378,50 @@ 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;
+
+ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
+
+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
+
+ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
+
 // FIXME: Remove the USE_INTERNAL_SDK condition once we support touch events when building for iOS with
 // the public SDK. See <https://webkit.org/b/179167>.
 ENABLE_TOUCH_EVENTS = $(ENABLE_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_TOUCH_EVENTS;
 
+ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
+
+ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
+
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
+
+ENABLE_VIDEO = ENABLE_VIDEO;
+
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
+
+ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+
 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 = ;
+
+ENABLE_WEBASSEMBLY_STREAMING_API = ;
+
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS = $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_macosx = ENABLE_WEBDRIVER_MOUSE_INTERACTIONS;
 
+ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS = ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS;
+
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS;
 
+ENABLE_WEBGL = ENABLE_WEBGL;
+
+ENABLE_WEBGL2 = ENABLE_WEBGL2;
+
 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11));
 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU;
@@ -290,14 +430,24 @@ ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014));
 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU;
 
+ENABLE_WEB_API_STATISTICS = ;
+
+ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
+
 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 = ENABLE_WEB_AUTHN;
 
+ENABLE_WEB_CRYPTO = ENABLE_WEB_CRYPTO;
+
 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 = ENABLE_WEB_RTC;
 
-FEATURE_DEFINES = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CONTENT_FILTERING) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STREAM) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
+
+ENABLE_XSLT = ENABLE_XSLT;
+
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 7eef47f..a0add2a 100644 (file)
@@ -50,7 +50,7 @@ WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/We
 ANGLE_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/ANGLE $(SDKROOT)/usr/local/include/ANGLE;
 LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc/sdk/objc/Framework/Headers $(SDKROOT)/usr/local/include/webrtc/sdk/objc/Framework/Headers;
 
-HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(ANGLE_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
+HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(ANGLE_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
 INFOPLIST_FILE = Info.plist;
 
 INSTALL_PATH = $(INSTALL_PATH_$(WK_COCOA_TOUCH));
index de31690..7fcee29 100644 (file)
@@ -1148,38 +1148,44 @@ ifeq ($(USE_LLVM_TARGET_TRIPLES_FOR_CLANG),YES)
     TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
 endif
 
-ENABLED_FEATURES = $(shell $(CC) -std=$(CLANG_CXX_LANGUAGE_STANDARD) -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(patsubst %, -D%, $(FEATURE_DEFINES)) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep '\#define ENABLE_.* 1' | cut -d' ' -f2)
-
-ifeq ($(shell $(CC) -std=$(CLANG_CXX_LANGUAGE_STANDARD) -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
     WTF_PLATFORM_IOS_FAMILY = 1
 else
     WTF_PLATFORM_IOS_FAMILY = 0
 endif
 
-ifeq ($(shell $(CC) -std=$(CLANG_CXX_LANGUAGE_STANDARD) -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
     WTF_PLATFORM_MAC = 1
 else
     WTF_PLATFORM_MAC = 0
 endif
 
-ifeq ($(shell $(CC) -std=$(CLANG_CXX_LANGUAGE_STANDARD) -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
     USE_APPLE_INTERNAL_SDK = 1
 else
     USE_APPLE_INTERNAL_SDK = 0
 endif
 
-ifeq ($(shell $(CC) -std=$(CLANG_CXX_LANGUAGE_STANDARD) -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep HAVE_OS_DARK_MODE_SUPPORT | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep HAVE_OS_DARK_MODE_SUPPORT | cut -d' ' -f3), 1)
     HAVE_OS_DARK_MODE_SUPPORT = 1
 else
     HAVE_OS_DARK_MODE_SUPPORT = 0
 endif
 
+ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
+    ENABLE_ORIENTATION_EVENTS = 1
+endif
+
+ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_MEDIA_SOURCE | cut -d' ' -f3), 1)
+       ENABLE_MEDIA_SOURCE = 1
+endif
+
 ifeq ($(WTF_PLATFORM_IOS_FAMILY), 1)
-FEATURE_AND_PLATFORM_DEFINES = $(ENABLED_FEATURES) WTF_PLATFORM_IOS_FAMILY
+FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES) WTF_PLATFORM_IOS_FAMILY
 else ifeq ($(WTF_PLATFORM_MAC), 1)
-FEATURE_AND_PLATFORM_DEFINES = $(ENABLED_FEATURES) WTF_PLATFORM_MAC
+FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES) WTF_PLATFORM_MAC
 else
-FEATURE_AND_PLATFORM_DEFINES = $(ENABLED_FEATURES)
+FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES)
 endif
 
 ifeq ($(HAVE_OS_DARK_MODE_SUPPORT), 1)
@@ -1195,16 +1201,16 @@ endif
 endif
 
 ADDITIONAL_BINDING_IDLS =
-ifeq ($(findstring ENABLE_MAC_GESTURE_EVENTS,$(ENABLED_FEATURES)), ENABLE_MAC_GESTURE_EVENTS)
+ifeq ($(findstring ENABLE_MAC_GESTURE_EVENTS,$(FEATURE_DEFINES)), ENABLE_MAC_GESTURE_EVENTS)
 ADDITIONAL_BINDING_IDLS += GestureEvent.idl
 endif
 
-ifeq ($(findstring ENABLE_IOS_GESTURE_EVENTS,$(ENABLED_FEATURES)), ENABLE_IOS_GESTURE_EVENTS)
+ifeq ($(findstring ENABLE_IOS_GESTURE_EVENTS,$(FEATURE_DEFINES)), ENABLE_IOS_GESTURE_EVENTS)
 ADDITIONAL_BINDING_IDLS += GestureEvent.idl
 endif
 
 ifeq ($(WTF_PLATFORM_IOS_FAMILY), 1)
-ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(ENABLED_FEATURES)), ENABLE_IOS_TOUCH_EVENTS)
+ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
 ADDITIONAL_BINDING_IDLS += \
     DocumentTouch.idl \
     Touch.idl \
@@ -1301,10 +1307,26 @@ all : \
 
 ADDITIONAL_IDL_DEFINES :=
 
+ifndef ENABLE_ORIENTATION_EVENTS
+    ENABLE_ORIENTATION_EVENTS = 0
+endif
+
+ifndef ENABLE_MEDIA_SOURCE
+       ENABLE_MEDIA_SOURCE = 0
+endif
+
+ifeq ($(ENABLE_ORIENTATION_EVENTS), 1)
+    ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_ORIENTATION_EVENTS
+endif
+
 ifeq ($(USE_APPLE_INTERNAL_SDK), 1)
     ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) USE_APPLE_INTERNAL_SDK
 endif
 
+ifeq ($(ENABLE_MEDIA_SOURCE), 1)
+    ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_MEDIA_SOURCE
+endif
+
 # CSS property names and value keywords
 
 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSProperties.json
@@ -1341,10 +1363,10 @@ $(CSS_VALUE_KEYWORD_FILES_PATTERNS) : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalu
 # CSS Selector pseudo type name to value map.
 
 SelectorPseudoClassAndCompatibilityElementMap.cpp : $(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in
-       $(PYTHON) "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in gperf "$(ENABLED_FEATURES)"
+       $(PYTHON) "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in gperf "$(FEATURE_DEFINES)"
 
 SelectorPseudoElementTypeMap.cpp : $(WebCore)/css/makeSelectorPseudoElementsMap.py $(WebCore)/css/SelectorPseudoElementTypeMap.in
-       $(PYTHON) "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WebCore)/css/SelectorPseudoElementTypeMap.in gperf "$(ENABLED_FEATURES)"
+       $(PYTHON) "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WebCore)/css/SelectorPseudoElementTypeMap.in gperf "$(FEATURE_DEFINES)"
 
 # --------
 
@@ -1412,19 +1434,19 @@ ColorData.cpp : platform/ColorData.gperf $(WebCore)/make-hash-tools.pl
 
 USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html.css $(WebCore)/css/dialog.css $(WebCore)/css/quirks.css $(WebCore)/css/plugIns.css $(WebCore)/css/svg.css
 
-ifeq ($(findstring ENABLE_MATHML,$(ENABLED_FEATURES)), ENABLE_MATHML)
+ifeq ($(findstring ENABLE_MATHML,$(FEATURE_DEFINES)), ENABLE_MATHML)
     USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mathml.css
 endif
 
-ifeq ($(findstring ENABLE_VIDEO,$(ENABLED_FEATURES)), ENABLE_VIDEO)
+ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_DEFINES)), ENABLE_VIDEO)
     USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mediaControls.css
 endif
 
-ifeq ($(findstring ENABLE_FULLSCREEN_API,$(ENABLED_FEATURES)), ENABLE_FULLSCREEN_API)
+ifeq ($(findstring ENABLE_FULLSCREEN_API,$(FEATURE_DEFINES)), ENABLE_FULLSCREEN_API)
     USER_AGENT_STYLE_SHEETS += $(WebCore)/css/fullscreen.css
 endif
 
-ifeq ($(findstring ENABLE_SERVICE_CONTROLS,$(ENABLED_FEATURES)), ENABLE_SERVICE_CONTROLS)
+ifeq ($(findstring ENABLE_SERVICE_CONTROLS,$(FEATURE_DEFINES)), ENABLE_SERVICE_CONTROLS)
     USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/mac/imageControlsMac.css
 endif
 
@@ -1436,7 +1458,7 @@ ifeq ($(OS), Windows_NT)
     USER_AGENT_STYLE_SHEETS += $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css
 endif
 
-ifeq ($(findstring ENABLE_METER_ELEMENT,$(ENABLED_FEATURES)), ENABLE_METER_ELEMENT)
+ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_DEFINES)), ENABLE_METER_ELEMENT)
        USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/meterElementShadow.css
 endif
 
@@ -1489,35 +1511,35 @@ $(WEBKIT_FONT_FAMILY_NAME_FILES_PATTERNS): dom/make_names.pl bindings/scripts/Ha
 
 # HTML tag and attribute names
 
-ifeq ($(findstring ENABLE_DATALIST_ELEMENT,$(ENABLED_FEATURES)), ENABLE_DATALIST_ELEMENT)
+ifeq ($(findstring ENABLE_DATALIST_ELEMENT,$(FEATURE_DEFINES)), ENABLE_DATALIST_ELEMENT)
     HTML_FLAGS := $(HTML_FLAGS) ENABLE_DATALIST_ELEMENT=1
 endif
 
-ifeq ($(findstring ENABLE_METER_ELEMENT,$(ENABLED_FEATURES)), ENABLE_METER_ELEMENT)
+ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_DEFINES)), ENABLE_METER_ELEMENT)
     HTML_FLAGS := $(HTML_FLAGS) ENABLE_METER_ELEMENT=1
 endif
 
-ifeq ($(findstring ENABLE_VIDEO,$(ENABLED_FEATURES)), ENABLE_VIDEO)
+ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_DEFINES)), ENABLE_VIDEO)
     HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO=1
 endif
 
-ifeq ($(findstring ENABLE_VIDEO_TRACK,$(ENABLED_FEATURES)), ENABLE_VIDEO_TRACK)
+ifeq ($(findstring ENABLE_VIDEO_TRACK,$(FEATURE_DEFINES)), ENABLE_VIDEO_TRACK)
     HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO_TRACK=0
 endif
 
-ifeq ($(findstring ENABLE_DATACUE_VALUE,$(ENABLED_FEATURES)), ENABLE_DATACUE_VALUE)
+ifeq ($(findstring ENABLE_DATACUE_VALUE,$(FEATURE_DEFINES)), ENABLE_DATACUE_VALUE)
     HTML_FLAGS := $(HTML_FLAGS) ENABLE_DATACUE_VALUE=0
 endif
 
-ifeq ($(findstring ENABLE_MEDIA_STREAM,$(ENABLED_FEATURES)), ENABLE_MEDIA_STREAM)
+ifeq ($(findstring ENABLE_MEDIA_STREAM,$(FEATURE_DEFINES)), ENABLE_MEDIA_STREAM)
     HTML_FLAGS := $(HTML_FLAGS) ENABLE_MEDIA_STREAM=1
 endif
 
-ifeq ($(findstring ENABLE_LEGACY_ENCRYPTED_MEDIA,$(ENABLED_FEATURES)), ENABLE_LEGACY_ENCRYPTED_MEDIA)
+ifeq ($(findstring ENABLE_LEGACY_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_LEGACY_ENCRYPTED_MEDIA)
     HTML_FLAGS := $(HTML_FLAGS) ENABLE_LEGACY_ENCRYPTED_MEDIA=1
 endif
 
-ifeq ($(findstring ENABLE_ENCRYPTED_MEDIA,$(ENABLED_FEATURES)), ENABLE_ENCRYPTED_MEDIA)
+ifeq ($(findstring ENABLE_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_ENCRYPTED_MEDIA)
     HTML_FLAGS := $(HTML_FLAGS) ENABLE_ENCRYPTED_MEDIA=1
 endif
 
@@ -1547,7 +1569,7 @@ XMLNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/Sta
 
 # SVG tag and attribute names, and element factory
 
-ifeq ($(findstring ENABLE_SVG_FONTS,$(ENABLED_FEATURES)), ENABLE_SVG_FONTS)
+ifeq ($(findstring ENABLE_SVG_FONTS,$(FEATURE_DEFINES)), ENABLE_SVG_FONTS)
     SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FONTS=1
 endif
 
index 2579f62..1906373 100644 (file)
@@ -1,5 +1,18 @@
 2020-02-10  Truitt Savell  <tsavell@apple.com>
 
+        Unreviewed, rolling out r256091.
+
+        Broke internal builds
+
+        Reverted changeset:
+
+        "Move trivial definitions from FeatureDefines.xcconfig to
+        PlatformEnableCocoa.h"
+        https://bugs.webkit.org/show_bug.cgi?id=207155
+        https://trac.webkit.org/changeset/256091
+
+2020-02-10  Truitt Savell  <tsavell@apple.com>
+
         Unreviewed, rolling out r256103.
 
         This patch is blocking the rollout of r256091
index 7c79b3d..f4d26e3 100644 (file)
 
 #include "WebKitTargetConditionals.xcconfig"
 
+ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
+
+ENABLE_ACCELERATED_2D_CANVAS = ;
+
 ENABLE_ACCESSIBILITY_ISOLATED_TREE = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE_$(WK_PLATFORM_NAME));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_macosx = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE$(WK_MACOS_1016));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_MACOS_SINCE_1016 = ENABLE_ACCESSIBILITY_ISOLATED_TREE;
@@ -61,6 +65,16 @@ ENABLE_APPLE_PAY_SESSION_V9_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V9;
 ENABLE_APPLE_PAY_SESSION_V9_macosx = $(ENABLE_APPLE_PAY_SESSION_V9$(WK_MACOS_1015));
 ENABLE_APPLE_PAY_SESSION_V9_MACOS_SINCE_1015 = ENABLE_APPLE_PAY_SESSION_V9;
 
+ENABLE_APPLICATION_MANIFEST = ENABLE_APPLICATION_MANIFEST;
+
+ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+
+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
+
+ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
+
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
+
 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -71,6 +85,12 @@ ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
 // FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
 ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
+ENABLE_CSS3_TEXT = ;
+
+ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
+
+ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
+
 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME));
 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS;
@@ -83,12 +103,34 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
+ENABLE_CSS_DEVICE_ADAPTATION = ;
+
+ENABLE_CSS_IMAGE_RESOLUTION = ;
+
+ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
+
+ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
+
+ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+
+ENABLE_CSS_TRAILING_WORD = ENABLE_CSS_TRAILING_WORD;
+
+ENABLE_CSS_TYPED_OM = ENABLE_CSS_TYPED_OM;
+
+ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
+
+ENABLE_CUSTOM_SCHEME_HANDLER = ;
+
 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
 
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
+
+ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT;
+
 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
@@ -125,6 +167,8 @@ ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSION
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
 ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
 
+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
+
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
@@ -152,6 +196,14 @@ ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
 
+ENABLE_GPU_PROCESS = ENABLE_GPU_PROCESS;
+
+ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
+
+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
+
+ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
+
 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
@@ -184,12 +236,26 @@ ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
 
+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
+
+ENABLE_INSPECTOR_TELEMETRY = ENABLE_INSPECTOR_TELEMETRY;
+
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
+
+ENABLE_INTL = ENABLE_INTL;
+
 ENABLE_IOS_GESTURE_EVENTS = $(ENABLE_IOS_GESTURE_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_GESTURE_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_IOS_TOUCH_EVENTS = $(ENABLE_IOS_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
 
+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
+
+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_$(WK_PLATFORM_NAME));
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
@@ -208,29 +274,51 @@ ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVEN
 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;
+
 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH));
 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE;
 
+ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
+
+ENABLE_MEDIA_SESSION = ;
+
 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_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
+ENABLE_MEMORY_SAMPLER = ENABLE_MEMORY_SAMPLER;
+
+ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
+
+ENABLE_MHTML = ;
+
 ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
+ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION = ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION;
+
+ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE = ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE;
+
 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
+ENABLE_OFFSCREEN_CANVAS = ;
+
 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH));
 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH;
 
+ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
+
 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME));
 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API;
 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API;
@@ -253,12 +341,34 @@ ENABLE_POINTER_EVENTS_watchsimulator[sdk=watch*5.*] = ;
 ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
+ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
+
+ENABLE_QUOTA = ;
+
+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
+
+ENABLE_RESIZE_OBSERVER = ENABLE_RESIZE_OBSERVER;
+
+ENABLE_RESOLUTION_MEDIA_QUERY = ;
+
+ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+
+ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
+
 ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
+ENABLE_SANDBOX_EXTENSIONS = ENABLE_SANDBOX_EXTENSIONS;
+
+ENABLE_SERVER_PRECONNECT = ENABLE_SERVER_PRECONNECT;
+
 ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
+ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
+
+ENABLE_SHAREABLE_RESOURCE = ENABLE_SHAREABLE_RESOURCE;
+
 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
@@ -268,20 +378,50 @@ 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;
+
+ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
+
+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
+
+ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
+
 // FIXME: Remove the USE_INTERNAL_SDK condition once we support touch events when building for iOS with
 // the public SDK. See <https://webkit.org/b/179167>.
 ENABLE_TOUCH_EVENTS = $(ENABLE_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_TOUCH_EVENTS;
 
+ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
+
+ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
+
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
+
+ENABLE_VIDEO = ENABLE_VIDEO;
+
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
+
+ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+
 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 = ;
+
+ENABLE_WEBASSEMBLY_STREAMING_API = ;
+
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS = $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_macosx = ENABLE_WEBDRIVER_MOUSE_INTERACTIONS;
 
+ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS = ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS;
+
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS;
 
+ENABLE_WEBGL = ENABLE_WEBGL;
+
+ENABLE_WEBGL2 = ENABLE_WEBGL2;
+
 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11));
 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU;
@@ -290,14 +430,24 @@ ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014));
 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU;
 
+ENABLE_WEB_API_STATISTICS = ;
+
+ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
+
 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 = ENABLE_WEB_AUTHN;
 
+ENABLE_WEB_CRYPTO = ENABLE_WEB_CRYPTO;
+
 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 = ENABLE_WEB_RTC;
 
-FEATURE_DEFINES = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CONTENT_FILTERING) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STREAM) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
+
+ENABLE_XSLT = ENABLE_XSLT;
+
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index ddc8b56..360691a 100644 (file)
@@ -38,7 +38,7 @@ SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Pri
 OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
 
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(inherited);
+HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
 INSTALL_PATH = /usr/local/lib;
 INSTALLHDRS_COPY_PHASE = YES;
 INSTALLHDRS_SCRIPT_PHASE = YES;
index d53fde9..b4ff3ea 100755 (executable)
@@ -21,24 +21,4 @@ if [ $# -eq 0 ]; then
     echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
 fi
 
-if [ ! $CC ]; then
-    export CC="`xcrun -find clang`"
-fi
-
-if [ -n "$SDKROOT" ]; then
-    SDK_FLAGS="-isysroot ${SDKROOT}"
-fi
-
-if [ "${USE_LLVM_TARGET_TRIPLES_FOR_CLANG}" = "YES" ]; then
-    # FIXME: This is probably wrong for fat builds, but matches the current behavior of DerivedSources.make
-    WK_CURRENT_ARCH=$(echo ${ARCHS} | cut -d " " -f1)
-    TARGET_TRIPLE_FLAGS="-target ${WK_CURRENT_ARCH}-${LLVM_TARGET_TRIPLE_VENDOR}-${LLVM_TARGET_TRIPLE_OS_VERSION}${LLVM_TARGET_TRIPLE_SUFFIX}"
-fi
-
-FRAMEWORK_FLAGS=$(echo ${BUILT_PRODUCTS_DIR} ${FRAMEWORK_SEARCH_PATHS} ${SYSTEM_FRAMEWORK_SEARCH_PATHS} | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
-HEADER_FLAGS=$(echo ${BUILT_PRODUCTS_DIR} ${HEADER_SEARCH_PATHS} ${SYSTEM_HEADER_SEARCH_PATHS} | perl -e 'print "-I" . join(" -I", split(" ", <>));')
-
-FEATURE_DEFINES_FROM_XCCONFIG=$(echo ${FEATURE_DEFINES} | perl -e 'print "-D" . join(" -D", split(" ", <>));')
-ENABLED_FEATURES=$(${CC} -std=${CLANG_CXX_LANGUAGE_STANDARD} -x c++ -E -P -dM ${SDK_FLAGS} ${TARGET_TRIPLE_FLAGS} ${FEATURE_DEFINES_FROM_XCCONFIG} ${FRAMEWORK_FLAGS} ${HEADER_FLAGS} -include "wtf/Platform.h" /dev/null | grep '\#define ENABLE_.* 1' | cut -d' ' -f2)
-
-/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" "${ENABLED_FEATURES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "--dense-bundle-filter" "JS*" "--dense-bundle-filter" "bindings/js/*" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
+/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}" "--dense-bundle-filter" "JS*" "--dense-bundle-filter" "bindings/js/*" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
index d91cf68..2a57c4c 100644 (file)
                2DACB9E923755D0000B4C185 /* GraphicsContextImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F00123F1FAD87D600531D76 /* GraphicsContextImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2DAF343D1EA7E0F100382CD3 /* ConstantPropertyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DAF343B1EA7E0F100382CD3 /* ConstantPropertyMap.h */; };
                2DD5A7271EBEE47D009BA597 /* CompositionUnderline.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD5A7261EBEE47D009BA597 /* CompositionUnderline.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               2DDE1CE31F574AE500D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1CE41F574AE900D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1CF81F574C3900D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1CFA1F574C3E00D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1CFC1F574CEE00D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1CFE1F574CF300D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1D001F574CF700D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1D021F574D0000D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1D041F574D0500D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1D061F574D0A00D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
-               2DDE1D081F574D0E00D1A365 /* (null) in Headers */ = {isa = PBXBuildFile; };
+               2DDE1CE31F574AE500D1A365 /* JSVRFieldOfView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CE01F574AD100D1A365 /* JSVRFieldOfView.h */; };
+               2DDE1CE41F574AE900D1A365 /* JSVRDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CDE1F574AAB00D1A365 /* JSVRDisplay.h */; };
+               2DDE1CF81F574C3900D1A365 /* JSVRDisplayCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CE61F574BFF00D1A365 /* JSVRDisplayCapabilities.h */; };
+               2DDE1CFA1F574C3E00D1A365 /* JSVRDisplayEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CE81F574BFF00D1A365 /* JSVRDisplayEvent.h */; };
+               2DDE1CFC1F574CEE00D1A365 /* JSVRDisplayEventReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CEA1F574BFF00D1A365 /* JSVRDisplayEventReason.h */; };
+               2DDE1CFE1F574CF300D1A365 /* JSVREye.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CEC1F574BFF00D1A365 /* JSVREye.h */; };
+               2DDE1D001F574CF700D1A365 /* JSVREyeParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CEE1F574BFF00D1A365 /* JSVREyeParameters.h */; };
+               2DDE1D021F574D0000D1A365 /* JSVRFrameData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CF01F574BFF00D1A365 /* JSVRFrameData.h */; };
+               2DDE1D041F574D0500D1A365 /* JSVRLayerInit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CF21F574BFF00D1A365 /* JSVRLayerInit.h */; };
+               2DDE1D061F574D0A00D1A365 /* JSVRPose.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CF41F574BFF00D1A365 /* JSVRPose.h */; };
+               2DDE1D081F574D0E00D1A365 /* JSVRStageParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE1CF61F574BFF00D1A365 /* JSVRStageParameters.h */; };
                2DE70023192FE82A00B0975C /* DisplayRefreshMonitorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DE70022192FE82A00B0975C /* DisplayRefreshMonitorMac.h */; };
                2DF512CE1D873E47001D6780 /* ReplaceRangeWithTextCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF512CC1D873E47001D6780 /* ReplaceRangeWithTextCommand.h */; };
                2DFA488F1DB541D000362B99 /* BufferSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DFA488E1DB541C200362B99 /* BufferSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
                8AF4E55C11DC5A63000ED3DE /* PerformanceTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AF4E55911DC5A63000ED3DE /* PerformanceTiming.h */; };
                8BD37A68201BB39C0011734A /* ReadableStreamChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD37A67201BB39C0011734A /* ReadableStreamChunk.h */; settings = {ATTRIBUTES = (Private, ); }; };
                8E4C96DD1AD4483500365A50 /* JSFetchResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E4C96D91AD4483500365A50 /* JSFetchResponse.h */; };
+               8E620E8120EE6024007BC5EF /* VRPlatformDisplayClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E620E8020EE5FFC007BC5EF /* VRPlatformDisplayClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                8EC6C963201A251600FBFA53 /* GapLength.h in Headers */ = {isa = PBXBuildFile; fileRef = 8EC6C961201A250100FBFA53 /* GapLength.h */; settings = {ATTRIBUTES = (Private, ); }; };
                8F67561B1288B17B0047ACA3 /* EventQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F6756191288B17B0047ACA3 /* EventQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9001774112E0347800648462 /* OESStandardDerivatives.h in Headers */ = {isa = PBXBuildFile; fileRef = 9001773E12E0347800648462 /* OESStandardDerivatives.h */; };
                8E33CD93201A29C100E39093 /* GapLength.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GapLength.cpp; sourceTree = "<group>"; };
                8E4C96D81AD4483500365A50 /* JSFetchResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchResponse.cpp; sourceTree = "<group>"; };
                8E4C96D91AD4483500365A50 /* JSFetchResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFetchResponse.h; sourceTree = "<group>"; };
+               8E620E7E20EE5FE2007BC5EF /* VRPlatformDisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VRPlatformDisplay.cpp; sourceTree = "<group>"; };
+               8E620E8020EE5FFC007BC5EF /* VRPlatformDisplayClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VRPlatformDisplayClient.h; sourceTree = "<group>"; };
                8EC6C961201A250100FBFA53 /* GapLength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GapLength.h; sourceTree = "<group>"; };
                8F6756191288B17B0047ACA3 /* EventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventQueue.h; sourceTree = "<group>"; };
                8F934D831189F1EE00508D5D /* JSExecState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSExecState.h; sourceTree = "<group>"; };
                F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = SSLKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868402DE3B8601EA4122 /* Cursor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Cursor.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5973DDE15CFB2030027F804 /* LocaleCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocaleCocoa.h; sourceTree = "<group>"; };
-               F5973DDF15CFB2030027F804 /* LocaleCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LocaleCocoa.mm; path = ../cocoa/LocaleCocoa.mm; sourceTree = "<group>"; };
+               F5973DDF15CFB2030027F804 /* LocaleCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LocaleCocoa.mm; path = "../cocoa/LocaleCocoa.mm"; sourceTree = "<group>"; };
                F59C95FD1255B23F000623C0 /* BaseDateAndTimeInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseDateAndTimeInputType.cpp; sourceTree = "<group>"; };
                F59C95FE1255B23F000623C0 /* BaseDateAndTimeInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseDateAndTimeInputType.h; sourceTree = "<group>"; };
                F5A154251279534D00D0B0C0 /* ValidationMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ValidationMessage.cpp; sourceTree = "<group>"; };
                                656B84D70AEA1CE900A095B4 /* network */,
                                1A2E6E560CC551E0004A2062 /* sql */,
                                B2C3D9EC0D006C1D00EF6F26 /* text */,
+                               E188235F2031F50F00B42DF3 /* vr */,
                                DFDB912CF8E88A6DA1AD264F /* AbortableTaskQueue.h */,
                                49AE2D94134EE5F90072920A /* CalculationValue.cpp */,
                                49AE2D95134EE5F90072920A /* CalculationValue.h */,
                                BE8EF04D171C9014009B48C3 /* JSVideoTrackList.h in Headers */,
                                46E791491F97E01A00199739 /* JSVisibilityState.h in Headers */,
                                7779BD961F32246A00C21417 /* JSVisualViewport.h in Headers */,
-                               2DDE1CE41F574AE900D1A365 /* (null) in Headers */,
-                               2DDE1CF81F574C3900D1A365 /* (null) in Headers */,
-                               2DDE1CFA1F574C3E00D1A365 /* (null) in Headers */,
-                               2DDE1CFC1F574CEE00D1A365 /* (null) in Headers */,
-                               2DDE1CFE1F574CF300D1A365 /* (null) in Headers */,
-                               2DDE1D001F574CF700D1A365 /* (null) in Headers */,
-                               2DDE1CE31F574AE500D1A365 /* (null) in Headers */,
-                               2DDE1D021F574D0000D1A365 /* (null) in Headers */,
-                               2DDE1D041F574D0500D1A365 /* (null) in Headers */,
-                               2DDE1D061F574D0A00D1A365 /* (null) in Headers */,
-                               2DDE1D081F574D0E00D1A365 /* (null) in Headers */,
+                               2DDE1CE41F574AE900D1A365 /* JSVRDisplay.h in Headers */,
+                               2DDE1CF81F574C3900D1A365 /* JSVRDisplayCapabilities.h in Headers */,
+                               2DDE1CFA1F574C3E00D1A365 /* JSVRDisplayEvent.h in Headers */,
+                               2DDE1CFC1F574CEE00D1A365 /* JSVRDisplayEventReason.h in Headers */,
+                               2DDE1CFE1F574CF300D1A365 /* JSVREye.h in Headers */,
+                               2DDE1D001F574CF700D1A365 /* JSVREyeParameters.h in Headers */,
+                               2DDE1CE31F574AE500D1A365 /* JSVRFieldOfView.h in Headers */,
+                               2DDE1D021F574D0000D1A365 /* JSVRFrameData.h in Headers */,
+                               2DDE1D041F574D0500D1A365 /* JSVRLayerInit.h in Headers */,
+                               2DDE1D061F574D0A00D1A365 /* JSVRPose.h in Headers */,
+                               2DDE1D081F574D0E00D1A365 /* JSVRStageParameters.h in Headers */,
                                BE20508218A460C30080647E /* JSVTTCue.h in Headers */,
                                7AF9B20D18CFB5F400C64BEF /* JSVTTRegion.h in Headers */,
                                7AF9B20F18CFB5F400C64BEF /* JSVTTRegionList.h in Headers */,
index 992b66b..7540c51 100644 (file)
@@ -1,5 +1,18 @@
 2020-02-10  Truitt Savell  <tsavell@apple.com>
 
+        Unreviewed, rolling out r256091.
+
+        Broke internal builds
+
+        Reverted changeset:
+
+        "Move trivial definitions from FeatureDefines.xcconfig to
+        PlatformEnableCocoa.h"
+        https://bugs.webkit.org/show_bug.cgi?id=207155
+        https://trac.webkit.org/changeset/256091
+
+2020-02-10  Truitt Savell  <tsavell@apple.com>
+
         Unreviewed, rolling out r256103.
 
         This patch is blocking the rollout of r256091
index 7c79b3d..f4d26e3 100644 (file)
 
 #include "WebKitTargetConditionals.xcconfig"
 
+ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
+
+ENABLE_ACCELERATED_2D_CANVAS = ;
+
 ENABLE_ACCESSIBILITY_ISOLATED_TREE = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE_$(WK_PLATFORM_NAME));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_macosx = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE$(WK_MACOS_1016));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_MACOS_SINCE_1016 = ENABLE_ACCESSIBILITY_ISOLATED_TREE;
@@ -61,6 +65,16 @@ ENABLE_APPLE_PAY_SESSION_V9_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V9;
 ENABLE_APPLE_PAY_SESSION_V9_macosx = $(ENABLE_APPLE_PAY_SESSION_V9$(WK_MACOS_1015));
 ENABLE_APPLE_PAY_SESSION_V9_MACOS_SINCE_1015 = ENABLE_APPLE_PAY_SESSION_V9;
 
+ENABLE_APPLICATION_MANIFEST = ENABLE_APPLICATION_MANIFEST;
+
+ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+
+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
+
+ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
+
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
+
 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -71,6 +85,12 @@ ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
 // FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
 ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
+ENABLE_CSS3_TEXT = ;
+
+ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
+
+ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
+
 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME));
 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS;
@@ -83,12 +103,34 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
+ENABLE_CSS_DEVICE_ADAPTATION = ;
+
+ENABLE_CSS_IMAGE_RESOLUTION = ;
+
+ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
+
+ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
+
+ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+
+ENABLE_CSS_TRAILING_WORD = ENABLE_CSS_TRAILING_WORD;
+
+ENABLE_CSS_TYPED_OM = ENABLE_CSS_TYPED_OM;
+
+ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
+
+ENABLE_CUSTOM_SCHEME_HANDLER = ;
+
 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
 
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
+
+ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT;
+
 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
@@ -125,6 +167,8 @@ ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSION
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
 ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
 
+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
+
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
@@ -152,6 +196,14 @@ ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
 
+ENABLE_GPU_PROCESS = ENABLE_GPU_PROCESS;
+
+ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
+
+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
+
+ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
+
 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
@@ -184,12 +236,26 @@ ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
 
+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
+
+ENABLE_INSPECTOR_TELEMETRY = ENABLE_INSPECTOR_TELEMETRY;
+
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
+
+ENABLE_INTL = ENABLE_INTL;
+
 ENABLE_IOS_GESTURE_EVENTS = $(ENABLE_IOS_GESTURE_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_GESTURE_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_IOS_TOUCH_EVENTS = $(ENABLE_IOS_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
 
+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
+
+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_$(WK_PLATFORM_NAME));
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
@@ -208,29 +274,51 @@ ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVEN
 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;
+
 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH));
 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE;
 
+ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
+
+ENABLE_MEDIA_SESSION = ;
+
 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_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
+ENABLE_MEMORY_SAMPLER = ENABLE_MEMORY_SAMPLER;
+
+ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
+
+ENABLE_MHTML = ;
+
 ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
+ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION = ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION;
+
+ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE = ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE;
+
 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
+ENABLE_OFFSCREEN_CANVAS = ;
+
 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH));
 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH;
 
+ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
+
 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME));
 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API;
 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API;
@@ -253,12 +341,34 @@ ENABLE_POINTER_EVENTS_watchsimulator[sdk=watch*5.*] = ;
 ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
+ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
+
+ENABLE_QUOTA = ;
+
+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
+
+ENABLE_RESIZE_OBSERVER = ENABLE_RESIZE_OBSERVER;
+
+ENABLE_RESOLUTION_MEDIA_QUERY = ;
+
+ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+
+ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
+
 ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
+ENABLE_SANDBOX_EXTENSIONS = ENABLE_SANDBOX_EXTENSIONS;
+
+ENABLE_SERVER_PRECONNECT = ENABLE_SERVER_PRECONNECT;
+
 ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
+ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
+
+ENABLE_SHAREABLE_RESOURCE = ENABLE_SHAREABLE_RESOURCE;
+
 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
@@ -268,20 +378,50 @@ 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;
+
+ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
+
+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
+
+ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
+
 // FIXME: Remove the USE_INTERNAL_SDK condition once we support touch events when building for iOS with
 // the public SDK. See <https://webkit.org/b/179167>.
 ENABLE_TOUCH_EVENTS = $(ENABLE_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_TOUCH_EVENTS;
 
+ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
+
+ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
+
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
+
+ENABLE_VIDEO = ENABLE_VIDEO;
+
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
+
+ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+
 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 = ;
+
+ENABLE_WEBASSEMBLY_STREAMING_API = ;
+
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS = $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_macosx = ENABLE_WEBDRIVER_MOUSE_INTERACTIONS;
 
+ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS = ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS;
+
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS;
 
+ENABLE_WEBGL = ENABLE_WEBGL;
+
+ENABLE_WEBGL2 = ENABLE_WEBGL2;
+
 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11));
 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU;
@@ -290,14 +430,24 @@ ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014));
 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU;
 
+ENABLE_WEB_API_STATISTICS = ;
+
+ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
+
 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 = ENABLE_WEB_AUTHN;
 
+ENABLE_WEB_CRYPTO = ENABLE_WEB_CRYPTO;
+
 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 = ENABLE_WEB_RTC;
 
-FEATURE_DEFINES = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CONTENT_FILTERING) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STREAM) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
+
+ENABLE_XSLT = ENABLE_XSLT;
+
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 695b7b6..349e54d 100644 (file)
@@ -295,7 +295,7 @@ AUTOMATION_PROTOCOL_OUTPUT_FILES = \
 AUTOMATION_PROTOCOL_OUTPUT_PATTERNS = $(subst .,%,$(AUTOMATION_PROTOCOL_OUTPUT_FILES))
 
 ifeq ($(OS),MACOS)
-ifeq ($(shell $(CC) -std=$(CLANG_CXX_LANGUAGE_STANDARD) -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
        AUTOMATION_BACKEND_PLATFORM_ARGUMENTS = --platform iOS
 else
        AUTOMATION_BACKEND_PLATFORM_ARGUMENTS = --platform macOS
index 41d4444..87758a9 100755 (executable)
@@ -21,24 +21,4 @@ if [ $# -eq 0 ]; then
     echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
 fi
 
-if [ ! $CC ]; then
-    export CC="`xcrun -find clang`"
-fi
-
-if [ -n "$SDKROOT" ]; then
-    SDK_FLAGS="-isysroot ${SDKROOT}"
-fi
-
-if [ "${USE_LLVM_TARGET_TRIPLES_FOR_CLANG}" = "YES" ]; then
-    # FIXME: This is probably wrong for fat builds, but matches the current behavior of DerivedSources.make
-    WK_CURRENT_ARCH=$(echo ${ARCHS} | cut -d " " -f1)
-    TARGET_TRIPLE_FLAGS="-target ${WK_CURRENT_ARCH}-${LLVM_TARGET_TRIPLE_VENDOR}-${LLVM_TARGET_TRIPLE_OS_VERSION}${LLVM_TARGET_TRIPLE_SUFFIX}"
-fi
-
-FRAMEWORK_FLAGS=$(echo ${BUILT_PRODUCTS_DIR} ${FRAMEWORK_SEARCH_PATHS} ${SYSTEM_FRAMEWORK_SEARCH_PATHS} | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
-HEADER_FLAGS=$(echo ${BUILT_PRODUCTS_DIR} ${HEADER_SEARCH_PATHS} ${SYSTEM_HEADER_SEARCH_PATHS} | perl -e 'print "-I" . join(" -I", split(" ", <>));')
-
-FEATURE_DEFINES_FROM_XCCONFIG=$(echo ${FEATURE_DEFINES} | perl -e 'print "-D" . join(" -D", split(" ", <>));')
-ENABLED_FEATURES=$(${CC} -std=${CLANG_CXX_LANGUAGE_STANDARD} -x c++ -E -P -dM ${SDK_FLAGS} ${TARGET_TRIPLE_FLAGS} ${FEATURE_DEFINES_FROM_XCCONFIG} ${FRAMEWORK_FLAGS} ${HEADER_FLAGS} -include "wtf/Platform.h" /dev/null | grep '\#define ENABLE_.* 1' | cut -d' ' -f2)
-
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${ENABLED_FEATURES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${FEATURE_DEFINES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
index 8b4a096..ff29fb9 100644 (file)
@@ -1,3 +1,16 @@
+2020-02-10  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r256091.
+
+        Broke internal builds
+
+        Reverted changeset:
+
+        "Move trivial definitions from FeatureDefines.xcconfig to
+        PlatformEnableCocoa.h"
+        https://bugs.webkit.org/show_bug.cgi?id=207155
+        https://trac.webkit.org/changeset/256091
+
 2020-02-08  Sam Weinig  <weinig@apple.com>
 
         Move trivial definitions from FeatureDefines.xcconfig to PlatformEnableCocoa.h
index 98cc7b3..2d7ac44 100644 (file)
@@ -1,5 +1,18 @@
 2020-02-10  Truitt Savell  <tsavell@apple.com>
 
+        Unreviewed, rolling out r256091.
+
+        Broke internal builds
+
+        Reverted changeset:
+
+        "Move trivial definitions from FeatureDefines.xcconfig to
+        PlatformEnableCocoa.h"
+        https://bugs.webkit.org/show_bug.cgi?id=207155
+        https://trac.webkit.org/changeset/256091
+
+2020-02-10  Truitt Savell  <tsavell@apple.com>
+
         Unreviewed, rolling out r256103.
 
         This patch is blocking the rollout of r256091
index 7c79b3d..f4d26e3 100644 (file)
 
 #include "WebKitTargetConditionals.xcconfig"
 
+ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
+
+ENABLE_ACCELERATED_2D_CANVAS = ;
+
 ENABLE_ACCESSIBILITY_ISOLATED_TREE = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE_$(WK_PLATFORM_NAME));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_macosx = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE$(WK_MACOS_1016));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_MACOS_SINCE_1016 = ENABLE_ACCESSIBILITY_ISOLATED_TREE;
@@ -61,6 +65,16 @@ ENABLE_APPLE_PAY_SESSION_V9_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V9;
 ENABLE_APPLE_PAY_SESSION_V9_macosx = $(ENABLE_APPLE_PAY_SESSION_V9$(WK_MACOS_1015));
 ENABLE_APPLE_PAY_SESSION_V9_MACOS_SINCE_1015 = ENABLE_APPLE_PAY_SESSION_V9;
 
+ENABLE_APPLICATION_MANIFEST = ENABLE_APPLICATION_MANIFEST;
+
+ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+
+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
+
+ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
+
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
+
 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -71,6 +85,12 @@ ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
 // FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
 ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
+ENABLE_CSS3_TEXT = ;
+
+ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
+
+ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
+
 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME));
 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS;
@@ -83,12 +103,34 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
+ENABLE_CSS_DEVICE_ADAPTATION = ;
+
+ENABLE_CSS_IMAGE_RESOLUTION = ;
+
+ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
+
+ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
+
+ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+
+ENABLE_CSS_TRAILING_WORD = ENABLE_CSS_TRAILING_WORD;
+
+ENABLE_CSS_TYPED_OM = ENABLE_CSS_TYPED_OM;
+
+ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
+
+ENABLE_CUSTOM_SCHEME_HANDLER = ;
+
 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
 
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
+
+ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT;
+
 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
@@ -125,6 +167,8 @@ ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSION
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
 ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
 
+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
+
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
@@ -152,6 +196,14 @@ ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
 
+ENABLE_GPU_PROCESS = ENABLE_GPU_PROCESS;
+
+ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
+
+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
+
+ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
+
 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
@@ -184,12 +236,26 @@ ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
 
+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
+
+ENABLE_INSPECTOR_TELEMETRY = ENABLE_INSPECTOR_TELEMETRY;
+
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
+
+ENABLE_INTL = ENABLE_INTL;
+
 ENABLE_IOS_GESTURE_EVENTS = $(ENABLE_IOS_GESTURE_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_GESTURE_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_IOS_TOUCH_EVENTS = $(ENABLE_IOS_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
 
+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
+
+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_$(WK_PLATFORM_NAME));
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
@@ -208,29 +274,51 @@ ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVEN
 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;
+
 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH));
 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE;
 
+ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
+
+ENABLE_MEDIA_SESSION = ;
+
 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_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
+ENABLE_MEMORY_SAMPLER = ENABLE_MEMORY_SAMPLER;
+
+ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
+
+ENABLE_MHTML = ;
+
 ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
+ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION = ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION;
+
+ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE = ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE;
+
 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
+ENABLE_OFFSCREEN_CANVAS = ;
+
 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH));
 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH;
 
+ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
+
 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME));
 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API;
 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API;
@@ -253,12 +341,34 @@ ENABLE_POINTER_EVENTS_watchsimulator[sdk=watch*5.*] = ;
 ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
+ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
+
+ENABLE_QUOTA = ;
+
+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
+
+ENABLE_RESIZE_OBSERVER = ENABLE_RESIZE_OBSERVER;
+
+ENABLE_RESOLUTION_MEDIA_QUERY = ;
+
+ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+
+ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
+
 ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
+ENABLE_SANDBOX_EXTENSIONS = ENABLE_SANDBOX_EXTENSIONS;
+
+ENABLE_SERVER_PRECONNECT = ENABLE_SERVER_PRECONNECT;
+
 ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
+ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
+
+ENABLE_SHAREABLE_RESOURCE = ENABLE_SHAREABLE_RESOURCE;
+
 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
@@ -268,20 +378,50 @@ 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;
+
+ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
+
+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
+
+ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
+
 // FIXME: Remove the USE_INTERNAL_SDK condition once we support touch events when building for iOS with
 // the public SDK. See <https://webkit.org/b/179167>.
 ENABLE_TOUCH_EVENTS = $(ENABLE_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_TOUCH_EVENTS;
 
+ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
+
+ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
+
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
+
+ENABLE_VIDEO = ENABLE_VIDEO;
+
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
+
+ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+
 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 = ;
+
+ENABLE_WEBASSEMBLY_STREAMING_API = ;
+
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS = $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_macosx = ENABLE_WEBDRIVER_MOUSE_INTERACTIONS;
 
+ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS = ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS;
+
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS;
 
+ENABLE_WEBGL = ENABLE_WEBGL;
+
+ENABLE_WEBGL2 = ENABLE_WEBGL2;
+
 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11));
 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU;
@@ -290,14 +430,24 @@ ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014));
 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU;
 
+ENABLE_WEB_API_STATISTICS = ;
+
+ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
+
 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 = ENABLE_WEB_AUTHN;
 
+ENABLE_WEB_CRYPTO = ENABLE_WEB_CRYPTO;
+
 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 = ENABLE_WEB_RTC;
 
-FEATURE_DEFINES = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CONTENT_FILTERING) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STREAM) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
+
+ENABLE_XSLT = ENABLE_XSLT;
+
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 8c1c819..b123996 100644 (file)
@@ -62,21 +62,7 @@ HEADERS += \
 #
 endif
 
-FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
-HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
-
-ifneq ($(SDKROOT),)
-    SDK_FLAGS=-isysroot $(SDKROOT)
-endif
-
-ifeq ($(USE_LLVM_TARGET_TRIPLES_FOR_CLANG),YES)
-    WK_CURRENT_ARCH=$(word 1, $(ARCHS))
-    TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
-endif
-
-ENABLED_FEATURES = $(shell $(CC) -std=$(CLANG_CXX_LANGUAGE_STANDARD) -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(patsubst %, -D%, $(FEATURE_DEFINES)) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep '\#define ENABLE_.* 1' | cut -d' ' -f2)
-
-ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS, $(ENABLED_FEATURES)), ENABLE_IOS_TOUCH_EVENTS)
+ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS, $(FEATURE_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
 HEADERS += \
     $(PRIVATE_HEADERS_DIR)/WebEventRegion.h
 endif
@@ -87,6 +73,9 @@ migrate_headers : $(HEADERS)
 WEBCORE_HEADER_REPLACE_RULES = -e 's/<WebCore\//<WebKitLegacy\//' -e "s/(^ *)WEBCORE_EXPORT /\1/"
 WEBCORE_HEADER_MIGRATE_CMD = sed -E $(WEBCORE_HEADER_REPLACE_RULES) $< > $@; touch $(PRIVATE_HEADERS_DIR)
 
+FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
+HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
+
 $(PRIVATE_HEADERS_DIR)/% : % MigrateHeaders.make
        $(WEBCORE_HEADER_MIGRATE_CMD)
 
index f05db97..6d5a559 100755 (executable)
@@ -21,24 +21,4 @@ if [ $# -eq 0 ]; then
     echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
 fi
 
-if [ ! $CC ]; then
-    export CC="`xcrun -find clang`"
-fi
-
-if [ -n "$SDKROOT" ]; then
-    SDK_FLAGS="-isysroot ${SDKROOT}"
-fi
-
-if [ "${USE_LLVM_TARGET_TRIPLES_FOR_CLANG}" = "YES" ]; then
-    # FIXME: This is probably wrong for fat builds, but matches the current behavior of DerivedSources.make
-    WK_CURRENT_ARCH=$(echo ${ARCHS} | cut -d " " -f1)
-    TARGET_TRIPLE_FLAGS="-target ${WK_CURRENT_ARCH}-${LLVM_TARGET_TRIPLE_VENDOR}-${LLVM_TARGET_TRIPLE_OS_VERSION}${LLVM_TARGET_TRIPLE_SUFFIX}"
-fi
-
-FRAMEWORK_FLAGS=$(echo ${BUILT_PRODUCTS_DIR} ${FRAMEWORK_SEARCH_PATHS} ${SYSTEM_FRAMEWORK_SEARCH_PATHS} | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
-HEADER_FLAGS=$(echo ${BUILT_PRODUCTS_DIR} ${HEADER_SEARCH_PATHS} ${SYSTEM_HEADER_SEARCH_PATHS} | perl -e 'print "-I" . join(" -I", split(" ", <>));')
-
-FEATURE_DEFINES_FROM_XCCONFIG=$(echo ${FEATURE_DEFINES} | perl -e 'print "-D" . join(" -D", split(" ", <>));')
-ENABLED_FEATURES=$(${CC} -std=${CLANG_CXX_LANGUAGE_STANDARD} -x c++ -E -P -dM ${SDK_FLAGS} ${TARGET_TRIPLE_FLAGS} ${FEATURE_DEFINES_FROM_XCCONFIG} ${FRAMEWORK_FLAGS} ${HEADER_FLAGS} -include "wtf/Platform.h" /dev/null | grep '\#define ENABLE_.* 1' | cut -d' ' -f2)
-
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${ENABLED_FEATURES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${FEATURE_DEFINES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
index fda437a..99cbcdf 100644 (file)
@@ -1,5 +1,18 @@
 2020-02-10  Truitt Savell  <tsavell@apple.com>
 
+        Unreviewed, rolling out r256091.
+
+        Broke internal builds
+
+        Reverted changeset:
+
+        "Move trivial definitions from FeatureDefines.xcconfig to
+        PlatformEnableCocoa.h"
+        https://bugs.webkit.org/show_bug.cgi?id=207155
+        https://trac.webkit.org/changeset/256091
+
+2020-02-10  Truitt Savell  <tsavell@apple.com>
+
         Unreviewed, rolling out r256103.
 
         This patch is blocking the rollout of r256091
index 7c79b3d..f4d26e3 100644 (file)
 
 #include "WebKitTargetConditionals.xcconfig"
 
+ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
+
+ENABLE_ACCELERATED_2D_CANVAS = ;
+
 ENABLE_ACCESSIBILITY_ISOLATED_TREE = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE_$(WK_PLATFORM_NAME));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_macosx = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE$(WK_MACOS_1016));
 ENABLE_ACCESSIBILITY_ISOLATED_TREE_MACOS_SINCE_1016 = ENABLE_ACCESSIBILITY_ISOLATED_TREE;
@@ -61,6 +65,16 @@ ENABLE_APPLE_PAY_SESSION_V9_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V9;
 ENABLE_APPLE_PAY_SESSION_V9_macosx = $(ENABLE_APPLE_PAY_SESSION_V9$(WK_MACOS_1015));
 ENABLE_APPLE_PAY_SESSION_V9_MACOS_SINCE_1015 = ENABLE_APPLE_PAY_SESSION_V9;
 
+ENABLE_APPLICATION_MANIFEST = ENABLE_APPLICATION_MANIFEST;
+
+ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
+
+ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
+
+ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
+
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
+
 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -71,6 +85,12 @@ ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
 // FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
 ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
+ENABLE_CSS3_TEXT = ;
+
+ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
+
+ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
+
 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME));
 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS;
@@ -83,12 +103,34 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
+ENABLE_CSS_DEVICE_ADAPTATION = ;
+
+ENABLE_CSS_IMAGE_RESOLUTION = ;
+
+ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
+
+ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
+
+ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+
+ENABLE_CSS_TRAILING_WORD = ENABLE_CSS_TRAILING_WORD;
+
+ENABLE_CSS_TYPED_OM = ENABLE_CSS_TYPED_OM;
+
+ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
+
+ENABLE_CUSTOM_SCHEME_HANDLER = ;
+
 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME));
 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS;
 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS;
 
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
+
+ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT;
+
 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
@@ -125,6 +167,8 @@ ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSION
 ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS;
 ENABLE_FAST_JIT_PERMISSIONS_maccatalyst = ;
 
+ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
+
 ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(WK_PLATFORM_NAME))
 ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT;
 ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT;
@@ -152,6 +196,14 @@ ENABLE_GEOLOCATION_iphonesimulator = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_maccatalyst = ENABLE_GEOLOCATION;
 ENABLE_GEOLOCATION_macosx = ENABLE_GEOLOCATION;
 
+ENABLE_GPU_PROCESS = ENABLE_GPU_PROCESS;
+
+ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
+
+ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
+
+ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
+
 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
@@ -184,12 +236,26 @@ ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
 
+ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
+
+ENABLE_INSPECTOR_TELEMETRY = ENABLE_INSPECTOR_TELEMETRY;
+
+ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
+
+ENABLE_INTL = ENABLE_INTL;
+
 ENABLE_IOS_GESTURE_EVENTS = $(ENABLE_IOS_GESTURE_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_GESTURE_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_IOS_TOUCH_EVENTS = $(ENABLE_IOS_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_IOS_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
 
+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
+
+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_$(WK_PLATFORM_NAME));
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphoneos = ENABLE_LEGACY_ENCRYPTED_MEDIA;
 ENABLE_LEGACY_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_LEGACY_ENCRYPTED_MEDIA;
@@ -208,29 +274,51 @@ ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVEN
 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;
+
 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH));
 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE;
 
+ENABLE_MEDIA_CONTROLS_SCRIPT = ENABLE_MEDIA_CONTROLS_SCRIPT;
+
+ENABLE_MEDIA_SESSION = ;
+
 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_$(WK_PLATFORM_NAME));
 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM;
 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM;
 
+ENABLE_MEMORY_SAMPLER = ENABLE_MEMORY_SAMPLER;
+
+ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
+
+ENABLE_MHTML = ;
+
 ENABLE_MOUSE_CURSOR_SCALE = $(ENABLE_MOUSE_CURSOR_SCALE_$(WK_PLATFORM_NAME));
 ENABLE_MOUSE_CURSOR_SCALE_macosx = ENABLE_MOUSE_CURSOR_SCALE;
 
 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH));
 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE;
 
+ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION = ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION;
+
+ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE = ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE;
+
 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(WK_PLATFORM_NAME));
 ENABLE_NOTIFICATIONS_macosx = ENABLE_NOTIFICATIONS;
 
+ENABLE_OFFSCREEN_CANVAS = ;
+
 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH));
 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH;
 
+ENABLE_PAYMENT_REQUEST = ENABLE_PAYMENT_REQUEST;
+
 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME));
 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API;
 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API;
@@ -253,12 +341,34 @@ ENABLE_POINTER_EVENTS_watchsimulator[sdk=watch*5.*] = ;
 ENABLE_POINTER_LOCK = $(ENABLE_POINTER_LOCK_$(WK_PLATFORM_NAME));
 ENABLE_POINTER_LOCK_macosx = ENABLE_POINTER_LOCK;
 
+ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
+
+ENABLE_QUOTA = ;
+
+ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
+
+ENABLE_RESIZE_OBSERVER = ENABLE_RESIZE_OBSERVER;
+
+ENABLE_RESOLUTION_MEDIA_QUERY = ;
+
+ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+
+ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
+
 ENABLE_RUBBER_BANDING = $(ENABLE_RUBBER_BANDING_$(WK_PLATFORM_NAME));
 ENABLE_RUBBER_BANDING_macosx = ENABLE_RUBBER_BANDING;
 
+ENABLE_SANDBOX_EXTENSIONS = ENABLE_SANDBOX_EXTENSIONS;
+
+ENABLE_SERVER_PRECONNECT = ENABLE_SERVER_PRECONNECT;
+
 ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(WK_PLATFORM_NAME));
 ENABLE_SERVICE_CONTROLS_macosx = ENABLE_SERVICE_CONTROLS;
 
+ENABLE_SERVICE_WORKER = ENABLE_SERVICE_WORKER;
+
+ENABLE_SHAREABLE_RESOURCE = ENABLE_SHAREABLE_RESOURCE;
+
 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME));
 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS;
 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS;
@@ -268,20 +378,50 @@ 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;
+
+ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
+
+ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
+
+ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
+
 // FIXME: Remove the USE_INTERNAL_SDK condition once we support touch events when building for iOS with
 // the public SDK. See <https://webkit.org/b/179167>.
 ENABLE_TOUCH_EVENTS = $(ENABLE_TOUCH_EVENTS_$(WK_COCOA_TOUCH)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
 ENABLE_TOUCH_EVENTS_cocoatouch_WITH_INTERNAL_SDK_YES = ENABLE_TOUCH_EVENTS;
 
+ENABLE_USERSELECT_ALL = ENABLE_USERSELECT_ALL;
+
+ENABLE_USER_MESSAGE_HANDLERS = ENABLE_USER_MESSAGE_HANDLERS;
+
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
+
+ENABLE_VIDEO = ENABLE_VIDEO;
+
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
+
+ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+
 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 = ;
+
+ENABLE_WEBASSEMBLY_STREAMING_API = ;
+
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS = $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_MOUSE_INTERACTIONS_macosx = ENABLE_WEBDRIVER_MOUSE_INTERACTIONS;
 
+ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS = ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS;
+
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME));
 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS;
 
+ENABLE_WEBGL = ENABLE_WEBGL;
+
+ENABLE_WEBGL2 = ENABLE_WEBGL2;
+
 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11));
 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU;
@@ -290,14 +430,24 @@ ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014));
 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU;
 
+ENABLE_WEB_API_STATISTICS = ;
+
+ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
+
 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 = ENABLE_WEB_AUTHN;
 
+ENABLE_WEB_CRYPTO = ENABLE_WEB_CRYPTO;
+
 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 = ENABLE_WEB_RTC;
 
-FEATURE_DEFINES = $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CONTENT_FILTERING) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STREAM) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
+
+ENABLE_XSLT = ENABLE_XSLT;
+
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);