Changeset 263953 in webkit
- Timestamp:
- Jul 5, 2020 12:31:57 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
-
Source/JavaScriptCore/ChangeLog (modified) (1 diff)
-
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
-
Source/WebCore/PAL/ChangeLog (modified) (1 diff)
-
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
-
Source/WebKit/ChangeLog (modified) (1 diff)
-
Source/WebKit/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
-
Source/WebKit/Configurations/WebKit.xcconfig (modified) (1 diff)
-
Source/WebKitLegacy/mac/ChangeLog (modified) (1 diff)
-
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
-
Tools/ChangeLog (modified) (1 diff)
-
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
-
Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r263951 r263953 1 2020-07-05 Darin Adler <darin@apple.com> 2 3 [Cocoa] Move almost all features from FeatureDefines.xcconfig to PlatformEnableCocoa.h 4 https://bugs.webkit.org/show_bug.cgi?id=212542 5 6 Reviewed by Sam Weinig. 7 8 * Configurations/FeatureDefines.xcconfig: Delete everything except 9 ENABLE_EXPERIMENTAL_FEATURES and ENABLE_WEBRTC. 10 1 11 2020-07-05 Philippe Normand <pnormand@igalia.com> 2 12 -
trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
r263947 r263953 42 42 // *** DO NOT ADD ANYTHING TO THIS FILE *** 43 43 44 #include "WebKitTargetConditionals.xcconfig" 45 46 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME)); 47 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 49 ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY; 50 51 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); 52 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; 53 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; 54 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING; 55 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; 56 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING; 57 ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING; 58 ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ; 59 60 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS; 61 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME)); 62 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS; 63 ENABLE_CSS_CONIC_GRADIENTS_iphoneos[sdk=iphone*11.*] = ; 64 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator = ENABLE_CSS_CONIC_GRADIENTS; 65 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ; 66 ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS; 67 ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS; 68 ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS; 69 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014)); 70 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS; 71 72 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); 73 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS; 74 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS; 75 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS; 76 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; 77 78 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME)); 79 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION; 80 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION; 81 ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION; 82 83 ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME)); 84 ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION; 85 ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION; 86 ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION; 87 ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION; 88 ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION; 89 ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION; 90 91 ENABLE_EDITABLE_REGION = $(ENABLE_EDITABLE_REGION_$(WK_PLATFORM_NAME)); 92 ENABLE_EDITABLE_REGION_iphoneos = ENABLE_EDITABLE_REGION; 93 ENABLE_EDITABLE_REGION_iphonesimulator = ENABLE_EDITABLE_REGION; 94 95 ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME)); 96 ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA; 97 ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA; 98 ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA; 99 ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA; 100 ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA; 101 ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA; 102 ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014)); 103 ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; 104 105 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 106 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 107 108 ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME)); 109 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD; 110 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD; 111 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD; 112 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD; 113 ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD; 114 ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD; 115 116 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME)); 117 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE; 118 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE; 119 ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE; 120 ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE; 121 122 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME)); 123 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 124 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 125 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 126 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 127 128 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME)); 129 ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH; 130 ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH; 131 ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH; 132 ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH; 133 134 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME)); 135 ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME; 136 ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME; 137 ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME; 138 ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME; 139 140 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME)); 141 ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK; 142 ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK; 143 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK; 144 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK; 145 146 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH)); 147 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE; 148 149 ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME)); 150 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM; 151 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM; 152 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM; 153 154 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH)); 155 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE; 156 157 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH)); 158 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH; 159 160 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME)); 161 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API; 162 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API; 163 ENABLE_PICTURE_IN_PICTURE_API_macosx = ENABLE_PICTURE_IN_PICTURE_API; 164 165 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME)); 166 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS; 167 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS; 168 ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS; 169 ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS; 170 ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS; 171 ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS; 172 ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; 173 174 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME)); 175 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE; 176 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE; 177 ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE; 178 ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE; 179 180 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME)); 181 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS; 182 183 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME)); 184 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11)); 185 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU; 186 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU; 187 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU; 188 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014)); 189 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU; 190 191 ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME)); 192 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN; 193 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN; 194 ENABLE_WEB_AUTHN_macosx = ENABLE_WEB_AUTHN; 195 44 // This ENABLE_WEB_RTC variable is used to decide whether to link the webrtc library. 45 // It does not need to be in FEATURE_DEFINES becaus it's also set in PlatformEnableCocoa.h. 196 46 ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME)); 197 47 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC; … … 199 49 ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC; 200 50 201 FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); 51 // ENABLE_EXPERIMENTAL_FEATURES is defined only here, not in PlatformEnable.h headers, at this time. 52 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 53 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 54 55 FEATURE_DEFINES = $(ENABLE_EXPERIMENTAL_FEATURES); -
trunk/Source/WebCore/ChangeLog
r263952 r263953 1 2020-07-05 Darin Adler <darin@apple.com> 2 3 [Cocoa] Move almost all features from FeatureDefines.xcconfig to PlatformEnableCocoa.h 4 https://bugs.webkit.org/show_bug.cgi?id=212542 5 6 Reviewed by Sam Weinig. 7 8 * Configurations/FeatureDefines.xcconfig: Delete everything except 9 ENABLE_EXPERIMENTAL_FEATURES and ENABLE_WEBRTC. 10 1 11 2020-07-05 Wenson Hsieh <wenson_hsieh@apple.com> 2 12 -
trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig
r263947 r263953 42 42 // *** DO NOT ADD ANYTHING TO THIS FILE *** 43 43 44 #include "WebKitTargetConditionals.xcconfig" 45 46 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME)); 47 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 49 ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY; 50 51 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); 52 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; 53 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; 54 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING; 55 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; 56 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING; 57 ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING; 58 ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ; 59 60 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS; 61 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME)); 62 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS; 63 ENABLE_CSS_CONIC_GRADIENTS_iphoneos[sdk=iphone*11.*] = ; 64 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator = ENABLE_CSS_CONIC_GRADIENTS; 65 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ; 66 ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS; 67 ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS; 68 ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS; 69 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014)); 70 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS; 71 72 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); 73 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS; 74 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS; 75 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS; 76 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; 77 78 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME)); 79 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION; 80 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION; 81 ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION; 82 83 ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME)); 84 ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION; 85 ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION; 86 ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION; 87 ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION; 88 ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION; 89 ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION; 90 91 ENABLE_EDITABLE_REGION = $(ENABLE_EDITABLE_REGION_$(WK_PLATFORM_NAME)); 92 ENABLE_EDITABLE_REGION_iphoneos = ENABLE_EDITABLE_REGION; 93 ENABLE_EDITABLE_REGION_iphonesimulator = ENABLE_EDITABLE_REGION; 94 95 ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME)); 96 ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA; 97 ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA; 98 ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA; 99 ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA; 100 ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA; 101 ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA; 102 ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014)); 103 ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; 104 105 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 106 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 107 108 ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME)); 109 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD; 110 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD; 111 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD; 112 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD; 113 ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD; 114 ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD; 115 116 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME)); 117 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE; 118 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE; 119 ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE; 120 ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE; 121 122 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME)); 123 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 124 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 125 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 126 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 127 128 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME)); 129 ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH; 130 ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH; 131 ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH; 132 ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH; 133 134 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME)); 135 ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME; 136 ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME; 137 ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME; 138 ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME; 139 140 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME)); 141 ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK; 142 ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK; 143 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK; 144 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK; 145 146 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH)); 147 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE; 148 149 ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME)); 150 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM; 151 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM; 152 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM; 153 154 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH)); 155 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE; 156 157 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH)); 158 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH; 159 160 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME)); 161 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API; 162 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API; 163 ENABLE_PICTURE_IN_PICTURE_API_macosx = ENABLE_PICTURE_IN_PICTURE_API; 164 165 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME)); 166 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS; 167 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS; 168 ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS; 169 ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS; 170 ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS; 171 ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS; 172 ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; 173 174 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME)); 175 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE; 176 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE; 177 ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE; 178 ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE; 179 180 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME)); 181 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS; 182 183 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME)); 184 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11)); 185 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU; 186 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU; 187 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU; 188 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014)); 189 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU; 190 191 ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME)); 192 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN; 193 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN; 194 ENABLE_WEB_AUTHN_macosx = ENABLE_WEB_AUTHN; 195 44 // This ENABLE_WEB_RTC variable is used to decide whether to link the webrtc library. 45 // It does not need to be in FEATURE_DEFINES becaus it's also set in PlatformEnableCocoa.h. 196 46 ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME)); 197 47 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC; … … 199 49 ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC; 200 50 201 FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); 51 // ENABLE_EXPERIMENTAL_FEATURES is defined only here, not in PlatformEnable.h headers, at this time. 52 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 53 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 54 55 FEATURE_DEFINES = $(ENABLE_EXPERIMENTAL_FEATURES); -
trunk/Source/WebCore/PAL/ChangeLog
r263952 r263953 1 2020-07-05 Darin Adler <darin@apple.com> 2 3 [Cocoa] Move almost all features from FeatureDefines.xcconfig to PlatformEnableCocoa.h 4 https://bugs.webkit.org/show_bug.cgi?id=212542 5 6 Reviewed by Sam Weinig. 7 8 * Configurations/FeatureDefines.xcconfig: Delete everything except 9 ENABLE_EXPERIMENTAL_FEATURES and ENABLE_WEBRTC. 10 1 11 2020-07-05 Wenson Hsieh <wenson_hsieh@apple.com> 2 12 -
trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
r263947 r263953 42 42 // *** DO NOT ADD ANYTHING TO THIS FILE *** 43 43 44 #include "WebKitTargetConditionals.xcconfig" 45 46 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME)); 47 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 49 ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY; 50 51 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); 52 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; 53 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; 54 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING; 55 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; 56 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING; 57 ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING; 58 ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ; 59 60 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS; 61 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME)); 62 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS; 63 ENABLE_CSS_CONIC_GRADIENTS_iphoneos[sdk=iphone*11.*] = ; 64 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator = ENABLE_CSS_CONIC_GRADIENTS; 65 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ; 66 ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS; 67 ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS; 68 ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS; 69 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014)); 70 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS; 71 72 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); 73 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS; 74 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS; 75 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS; 76 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; 77 78 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME)); 79 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION; 80 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION; 81 ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION; 82 83 ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME)); 84 ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION; 85 ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION; 86 ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION; 87 ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION; 88 ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION; 89 ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION; 90 91 ENABLE_EDITABLE_REGION = $(ENABLE_EDITABLE_REGION_$(WK_PLATFORM_NAME)); 92 ENABLE_EDITABLE_REGION_iphoneos = ENABLE_EDITABLE_REGION; 93 ENABLE_EDITABLE_REGION_iphonesimulator = ENABLE_EDITABLE_REGION; 94 95 ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME)); 96 ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA; 97 ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA; 98 ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA; 99 ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA; 100 ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA; 101 ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA; 102 ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014)); 103 ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; 104 105 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 106 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 107 108 ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME)); 109 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD; 110 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD; 111 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD; 112 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD; 113 ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD; 114 ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD; 115 116 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME)); 117 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE; 118 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE; 119 ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE; 120 ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE; 121 122 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME)); 123 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 124 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 125 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 126 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 127 128 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME)); 129 ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH; 130 ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH; 131 ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH; 132 ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH; 133 134 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME)); 135 ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME; 136 ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME; 137 ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME; 138 ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME; 139 140 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME)); 141 ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK; 142 ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK; 143 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK; 144 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK; 145 146 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH)); 147 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE; 148 149 ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME)); 150 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM; 151 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM; 152 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM; 153 154 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH)); 155 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE; 156 157 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH)); 158 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH; 159 160 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME)); 161 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API; 162 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API; 163 ENABLE_PICTURE_IN_PICTURE_API_macosx = ENABLE_PICTURE_IN_PICTURE_API; 164 165 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME)); 166 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS; 167 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS; 168 ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS; 169 ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS; 170 ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS; 171 ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS; 172 ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; 173 174 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME)); 175 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE; 176 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE; 177 ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE; 178 ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE; 179 180 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME)); 181 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS; 182 183 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME)); 184 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11)); 185 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU; 186 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU; 187 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU; 188 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014)); 189 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU; 190 191 ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME)); 192 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN; 193 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN; 194 ENABLE_WEB_AUTHN_macosx = ENABLE_WEB_AUTHN; 195 44 // This ENABLE_WEB_RTC variable is used to decide whether to link the webrtc library. 45 // It does not need to be in FEATURE_DEFINES becaus it's also set in PlatformEnableCocoa.h. 196 46 ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME)); 197 47 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC; … … 199 49 ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC; 200 50 201 FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); 51 // ENABLE_EXPERIMENTAL_FEATURES is defined only here, not in PlatformEnable.h headers, at this time. 52 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 53 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 54 55 FEATURE_DEFINES = $(ENABLE_EXPERIMENTAL_FEATURES); -
trunk/Source/WebKit/ChangeLog
r263949 r263953 1 2020-07-05 Darin Adler <darin@apple.com> 2 3 [Cocoa] Move almost all features from FeatureDefines.xcconfig to PlatformEnableCocoa.h 4 https://bugs.webkit.org/show_bug.cgi?id=212542 5 6 Reviewed by Sam Weinig. 7 8 * Configurations/FeatureDefines.xcconfig: Delete everything except 9 ENABLE_EXPERIMENTAL_FEATURES and ENABLE_WEBRTC. 10 11 * Configurations/WebKit.xcconfig: Added include of WebKitTargetConditionals.xcconfig. 12 1 13 2020-07-05 Said Abou-Hallawa <sabouhallawa@apple.com> 2 14 -
trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig
r263947 r263953 42 42 // *** DO NOT ADD ANYTHING TO THIS FILE *** 43 43 44 #include "WebKitTargetConditionals.xcconfig" 45 46 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME)); 47 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 49 ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY; 50 51 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); 52 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; 53 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; 54 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING; 55 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; 56 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING; 57 ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING; 58 ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ; 59 60 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS; 61 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME)); 62 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS; 63 ENABLE_CSS_CONIC_GRADIENTS_iphoneos[sdk=iphone*11.*] = ; 64 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator = ENABLE_CSS_CONIC_GRADIENTS; 65 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ; 66 ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS; 67 ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS; 68 ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS; 69 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014)); 70 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS; 71 72 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); 73 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS; 74 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS; 75 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS; 76 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; 77 78 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME)); 79 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION; 80 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION; 81 ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION; 82 83 ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME)); 84 ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION; 85 ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION; 86 ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION; 87 ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION; 88 ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION; 89 ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION; 90 91 ENABLE_EDITABLE_REGION = $(ENABLE_EDITABLE_REGION_$(WK_PLATFORM_NAME)); 92 ENABLE_EDITABLE_REGION_iphoneos = ENABLE_EDITABLE_REGION; 93 ENABLE_EDITABLE_REGION_iphonesimulator = ENABLE_EDITABLE_REGION; 94 95 ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME)); 96 ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA; 97 ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA; 98 ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA; 99 ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA; 100 ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA; 101 ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA; 102 ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014)); 103 ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; 104 105 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 106 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 107 108 ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME)); 109 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD; 110 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD; 111 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD; 112 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD; 113 ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD; 114 ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD; 115 116 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME)); 117 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE; 118 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE; 119 ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE; 120 ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE; 121 122 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME)); 123 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 124 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 125 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 126 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 127 128 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME)); 129 ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH; 130 ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH; 131 ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH; 132 ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH; 133 134 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME)); 135 ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME; 136 ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME; 137 ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME; 138 ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME; 139 140 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME)); 141 ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK; 142 ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK; 143 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK; 144 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK; 145 146 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH)); 147 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE; 148 149 ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME)); 150 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM; 151 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM; 152 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM; 153 154 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH)); 155 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE; 156 157 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH)); 158 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH; 159 160 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME)); 161 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API; 162 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API; 163 ENABLE_PICTURE_IN_PICTURE_API_macosx = ENABLE_PICTURE_IN_PICTURE_API; 164 165 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME)); 166 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS; 167 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS; 168 ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS; 169 ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS; 170 ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS; 171 ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS; 172 ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; 173 174 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME)); 175 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE; 176 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE; 177 ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE; 178 ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE; 179 180 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME)); 181 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS; 182 183 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME)); 184 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11)); 185 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU; 186 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU; 187 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU; 188 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014)); 189 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU; 190 191 ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME)); 192 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN; 193 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN; 194 ENABLE_WEB_AUTHN_macosx = ENABLE_WEB_AUTHN; 195 44 // This ENABLE_WEB_RTC variable is used to decide whether to link the webrtc library. 45 // It does not need to be in FEATURE_DEFINES becaus it's also set in PlatformEnableCocoa.h. 196 46 ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME)); 197 47 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC; … … 199 49 ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC; 200 50 201 FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); 51 // ENABLE_EXPERIMENTAL_FEATURES is defined only here, not in PlatformEnable.h headers, at this time. 52 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 53 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 54 55 FEATURE_DEFINES = $(ENABLE_EXPERIMENTAL_FEATURES); -
trunk/Source/WebKit/Configurations/WebKit.xcconfig
r262308 r263953 23 23 24 24 #include "BaseTarget.xcconfig" 25 #include "WebKitTargetConditionals.xcconfig" 25 26 26 27 PRODUCT_NAME = WebKit; -
trunk/Source/WebKitLegacy/mac/ChangeLog
r263947 r263953 1 2020-07-05 Darin Adler <darin@apple.com> 2 3 [Cocoa] Move almost all features from FeatureDefines.xcconfig to PlatformEnableCocoa.h 4 https://bugs.webkit.org/show_bug.cgi?id=212542 5 6 Reviewed by Sam Weinig. 7 8 * Configurations/FeatureDefines.xcconfig: Delete everything except 9 ENABLE_EXPERIMENTAL_FEATURES and ENABLE_WEBRTC. 10 1 11 2020-07-04 Darin Adler <darin@apple.com> 2 12 -
trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
r263947 r263953 42 42 // *** DO NOT ADD ANYTHING TO THIS FILE *** 43 43 44 #include "WebKitTargetConditionals.xcconfig" 45 46 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME)); 47 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 49 ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY; 50 51 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); 52 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; 53 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; 54 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING; 55 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; 56 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING; 57 ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING; 58 ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ; 59 60 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS; 61 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME)); 62 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS; 63 ENABLE_CSS_CONIC_GRADIENTS_iphoneos[sdk=iphone*11.*] = ; 64 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator = ENABLE_CSS_CONIC_GRADIENTS; 65 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ; 66 ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS; 67 ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS; 68 ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS; 69 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014)); 70 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS; 71 72 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); 73 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS; 74 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS; 75 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS; 76 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; 77 78 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME)); 79 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION; 80 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION; 81 ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION; 82 83 ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME)); 84 ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION; 85 ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION; 86 ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION; 87 ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION; 88 ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION; 89 ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION; 90 91 ENABLE_EDITABLE_REGION = $(ENABLE_EDITABLE_REGION_$(WK_PLATFORM_NAME)); 92 ENABLE_EDITABLE_REGION_iphoneos = ENABLE_EDITABLE_REGION; 93 ENABLE_EDITABLE_REGION_iphonesimulator = ENABLE_EDITABLE_REGION; 94 95 ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME)); 96 ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA; 97 ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA; 98 ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA; 99 ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA; 100 ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA; 101 ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA; 102 ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014)); 103 ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; 104 105 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 106 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 107 108 ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME)); 109 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD; 110 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD; 111 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD; 112 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD; 113 ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD; 114 ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD; 115 116 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME)); 117 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE; 118 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE; 119 ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE; 120 ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE; 121 122 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME)); 123 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 124 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 125 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 126 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 127 128 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME)); 129 ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH; 130 ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH; 131 ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH; 132 ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH; 133 134 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME)); 135 ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME; 136 ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME; 137 ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME; 138 ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME; 139 140 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME)); 141 ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK; 142 ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK; 143 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK; 144 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK; 145 146 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH)); 147 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE; 148 149 ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME)); 150 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM; 151 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM; 152 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM; 153 154 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH)); 155 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE; 156 157 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH)); 158 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH; 159 160 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME)); 161 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API; 162 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API; 163 ENABLE_PICTURE_IN_PICTURE_API_macosx = ENABLE_PICTURE_IN_PICTURE_API; 164 165 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME)); 166 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS; 167 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS; 168 ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS; 169 ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS; 170 ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS; 171 ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS; 172 ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; 173 174 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME)); 175 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE; 176 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE; 177 ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE; 178 ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE; 179 180 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME)); 181 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS; 182 183 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME)); 184 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11)); 185 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU; 186 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU; 187 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU; 188 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014)); 189 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU; 190 191 ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME)); 192 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN; 193 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN; 194 ENABLE_WEB_AUTHN_macosx = ENABLE_WEB_AUTHN; 195 44 // This ENABLE_WEB_RTC variable is used to decide whether to link the webrtc library. 45 // It does not need to be in FEATURE_DEFINES becaus it's also set in PlatformEnableCocoa.h. 196 46 ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME)); 197 47 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC; … … 199 49 ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC; 200 50 201 FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); 51 // ENABLE_EXPERIMENTAL_FEATURES is defined only here, not in PlatformEnable.h headers, at this time. 52 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 53 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 54 55 FEATURE_DEFINES = $(ENABLE_EXPERIMENTAL_FEATURES); -
trunk/Tools/ChangeLog
r263950 r263953 1 2020-07-05 Darin Adler <darin@apple.com> 2 3 [Cocoa] Move almost all features from FeatureDefines.xcconfig to PlatformEnableCocoa.h 4 https://bugs.webkit.org/show_bug.cgi?id=212542 5 6 Reviewed by Sam Weinig. 7 8 * TestWebKitAPI/Configurations/FeatureDefines.xcconfig: Delete everything except 9 ENABLE_EXPERIMENTAL_FEATURES and ENABLE_WEBRTC. 10 11 * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Added include of 12 WebKitTargetConditionals.xcconfig. 13 1 14 2020-07-05 Philippe Normand <pnormand@igalia.com> 2 15 -
trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
r263947 r263953 42 42 // *** DO NOT ADD ANYTHING TO THIS FILE *** 43 43 44 #include "WebKitTargetConditionals.xcconfig" 45 46 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME)); 47 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 49 ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY; 50 51 ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); 52 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; 53 ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; 54 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING; 55 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; 56 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING; 57 ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING; 58 ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ; 59 60 ENABLE_CSS_CONIC_GRADIENTS = ENABLE_CSS_CONIC_GRADIENTS; 61 ENABLE_CSS_CONIC_GRADIENTS = $(ENABLE_CSS_CONIC_GRADIENTS_$(WK_PLATFORM_NAME)); 62 ENABLE_CSS_CONIC_GRADIENTS_iphoneos = ENABLE_CSS_CONIC_GRADIENTS; 63 ENABLE_CSS_CONIC_GRADIENTS_iphoneos[sdk=iphone*11.*] = ; 64 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator = ENABLE_CSS_CONIC_GRADIENTS; 65 ENABLE_CSS_CONIC_GRADIENTS_iphonesimulator[sdk=iphone*11.*] = ; 66 ENABLE_CSS_CONIC_GRADIENTS_watchos = ENABLE_CSS_CONIC_GRADIENTS; 67 ENABLE_CSS_CONIC_GRADIENTS_watchsimulator = ENABLE_CSS_CONIC_GRADIENTS; 68 ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS; 69 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014)); 70 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS; 71 72 ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); 73 ENABLE_DARK_MODE_CSS_iphoneos = ENABLE_DARK_MODE_CSS; 74 ENABLE_DARK_MODE_CSS_iphonesimulator = ENABLE_DARK_MODE_CSS; 75 ENABLE_DARK_MODE_CSS_maccatalyst = ENABLE_DARK_MODE_CSS; 76 ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; 77 78 ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME)); 79 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION; 80 ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION; 81 ENABLE_DATA_INTERACTION_maccatalyst = ENABLE_DATA_INTERACTION; 82 83 ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME)); 84 ENABLE_DEVICE_ORIENTATION_iphoneos = ENABLE_DEVICE_ORIENTATION; 85 ENABLE_DEVICE_ORIENTATION_iphonesimulator = ENABLE_DEVICE_ORIENTATION; 86 ENABLE_DEVICE_ORIENTATION_watchos = ENABLE_DEVICE_ORIENTATION; 87 ENABLE_DEVICE_ORIENTATION_watchsimulator = ENABLE_DEVICE_ORIENTATION; 88 ENABLE_DEVICE_ORIENTATION_appletvos = ENABLE_DEVICE_ORIENTATION; 89 ENABLE_DEVICE_ORIENTATION_appletvsimulator = ENABLE_DEVICE_ORIENTATION; 90 91 ENABLE_EDITABLE_REGION = $(ENABLE_EDITABLE_REGION_$(WK_PLATFORM_NAME)); 92 ENABLE_EDITABLE_REGION_iphoneos = ENABLE_EDITABLE_REGION; 93 ENABLE_EDITABLE_REGION_iphonesimulator = ENABLE_EDITABLE_REGION; 94 95 ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME)); 96 ENABLE_ENCRYPTED_MEDIA_iphoneos = ENABLE_ENCRYPTED_MEDIA; 97 ENABLE_ENCRYPTED_MEDIA_iphonesimulator = ENABLE_ENCRYPTED_MEDIA; 98 ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA; 99 ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA; 100 ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA; 101 ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA; 102 ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014)); 103 ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; 104 105 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 106 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 107 108 ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(WK_PLATFORM_NAME)); 109 ENABLE_GAMEPAD_iphoneos = ENABLE_GAMEPAD; 110 ENABLE_GAMEPAD_iphonesimulator = ENABLE_GAMEPAD; 111 ENABLE_GAMEPAD_appletvos = ENABLE_GAMEPAD; 112 ENABLE_GAMEPAD_appletvsimulator = ENABLE_GAMEPAD; 113 ENABLE_GAMEPAD_maccatalyst = ENABLE_GAMEPAD; 114 ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD; 115 116 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME)); 117 ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE; 118 ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE; 119 ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE; 120 ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE; 121 122 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME)); 123 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 124 ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 125 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL; 126 ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL; 127 128 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME)); 129 ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH; 130 ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH; 131 ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH; 132 ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH; 133 134 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME)); 135 ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME; 136 ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME; 137 ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME; 138 ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME; 139 140 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME)); 141 ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK; 142 ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK; 143 ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK; 144 ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK; 145 146 ENABLE_MEDIA_CAPTURE = $(ENABLE_MEDIA_CAPTURE_$(WK_COCOA_TOUCH)); 147 ENABLE_MEDIA_CAPTURE_cocoatouch = ENABLE_MEDIA_CAPTURE; 148 149 ENABLE_MEDIA_STREAM = $(ENABLE_MEDIA_STREAM_$(WK_PLATFORM_NAME)); 150 ENABLE_MEDIA_STREAM_iphoneos = ENABLE_MEDIA_STREAM; 151 ENABLE_MEDIA_STREAM_iphonesimulator = ENABLE_MEDIA_STREAM; 152 ENABLE_MEDIA_STREAM_macosx = ENABLE_MEDIA_STREAM; 153 154 ENABLE_NAVIGATOR_STANDALONE = $(ENABLE_NAVIGATOR_STANDALONE_$(WK_COCOA_TOUCH)); 155 ENABLE_NAVIGATOR_STANDALONE_cocoatouch = ENABLE_NAVIGATOR_STANDALONE; 156 157 ENABLE_OVERFLOW_SCROLLING_TOUCH = $(ENABLE_OVERFLOW_SCROLLING_TOUCH_$(WK_COCOA_TOUCH)); 158 ENABLE_OVERFLOW_SCROLLING_TOUCH_cocoatouch = ENABLE_OVERFLOW_SCROLLING_TOUCH; 159 160 ENABLE_PICTURE_IN_PICTURE_API = $(ENABLE_PICTURE_IN_PICTURE_API_$(WK_PLATFORM_NAME)); 161 ENABLE_PICTURE_IN_PICTURE_API_iphoneos = ENABLE_PICTURE_IN_PICTURE_API; 162 ENABLE_PICTURE_IN_PICTURE_API_iphonesimulator = ENABLE_PICTURE_IN_PICTURE_API; 163 ENABLE_PICTURE_IN_PICTURE_API_macosx = ENABLE_PICTURE_IN_PICTURE_API; 164 165 ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(WK_PLATFORM_NAME)); 166 ENABLE_SPEECH_SYNTHESIS_iphoneos = ENABLE_SPEECH_SYNTHESIS; 167 ENABLE_SPEECH_SYNTHESIS_iphonesimulator = ENABLE_SPEECH_SYNTHESIS; 168 ENABLE_SPEECH_SYNTHESIS_watchos = ENABLE_SPEECH_SYNTHESIS; 169 ENABLE_SPEECH_SYNTHESIS_watchsimulator = ENABLE_SPEECH_SYNTHESIS; 170 ENABLE_SPEECH_SYNTHESIS_appletvos = ENABLE_SPEECH_SYNTHESIS; 171 ENABLE_SPEECH_SYNTHESIS_appletvsimulator = ENABLE_SPEECH_SYNTHESIS; 172 ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; 173 174 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME)); 175 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE; 176 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE; 177 ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE; 178 ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE; 179 180 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS = $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_$(WK_PLATFORM_NAME)); 181 ENABLE_WEBDRIVER_TOUCH_INTERACTIONS_iphoneos = ENABLE_WEBDRIVER_TOUCH_INTERACTIONS; 182 183 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME)); 184 ENABLE_WEBGPU_iphoneos = $(ENABLE_WEBGPU$(WK_IOS_11)); 185 ENABLE_WEBGPU_IOS_SINCE_11 = ENABLE_WEBGPU; 186 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU; 187 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU; 188 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1014)); 189 ENABLE_WEBGPU_MACOS_SINCE_1014 = ENABLE_WEBGPU; 190 191 ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME)); 192 ENABLE_WEB_AUTHN_iphoneos = ENABLE_WEB_AUTHN; 193 ENABLE_WEB_AUTHN_iphonesimulator = ENABLE_WEB_AUTHN; 194 ENABLE_WEB_AUTHN_macosx = ENABLE_WEB_AUTHN; 195 44 // This ENABLE_WEB_RTC variable is used to decide whether to link the webrtc library. 45 // It does not need to be in FEATURE_DEFINES becaus it's also set in PlatformEnableCocoa.h. 196 46 ENABLE_WEB_RTC = $(ENABLE_WEB_RTC_$(WK_PLATFORM_NAME)); 197 47 ENABLE_WEB_RTC_iphoneos = ENABLE_WEB_RTC; … … 199 49 ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC; 200 50 201 FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); 51 // ENABLE_EXPERIMENTAL_FEATURES is defined only here, not in PlatformEnable.h headers, at this time. 52 ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); 53 ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; 54 55 FEATURE_DEFINES = $(ENABLE_EXPERIMENTAL_FEATURES); -
trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig
r262957 r263953 22 22 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 23 24 #include " FeatureDefines.xcconfig"24 #include "WebKitTargetConditionals.xcconfig" 25 25 26 26 PRODUCT_NAME = TestWebKitAPI;
Note: See TracChangeset
for help on using the changeset viewer.
