Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (213672 => 213673)
--- trunk/Source/_javascript_Core/ChangeLog 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-03-09 22:34:52 UTC (rev 213673)
@@ -1,3 +1,14 @@
+2017-03-09 Anders Carlsson <[email protected]>
+
+ Add delegate support to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=169427
+ Part of rdar://problem/28880714.
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+ Add feature define.
+
2017-03-09 Nikita Vasilyev <[email protected]>
Web Inspector: Show individual messages in the content pane for a WebSocket
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (213672 => 213673)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-03-09 22:34:52 UTC (rev 213673)
@@ -35,6 +35,11 @@
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
+
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -51,6 +56,18 @@
ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_IF_NOT_YES = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphone*] = $(ENABLE_APPLE_PAY_DELEGATE_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_DELEGATE_iphoneos = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_iphonesimulator = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphonesimulator10*] = ;
+
+DISABLE_APPLE_PAY_DELEGATE_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_DELEGATE[sdk=macosx*] = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_ = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO);
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_YES = ;
+
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -233,4 +250,4 @@
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT
) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM)
$(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_DELEGATE) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_L
OAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATIS
TICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(
ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
Modified: trunk/Source/WebCore/ChangeLog (213672 => 213673)
--- trunk/Source/WebCore/ChangeLog 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebCore/ChangeLog 2017-03-09 22:34:52 UTC (rev 213673)
@@ -1,3 +1,52 @@
+2017-03-09 Anders Carlsson <[email protected]>
+
+ Add delegate support to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=169427
+ Part of rdar://problem/28880714.
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+ Add feature define.
+
+ * DerivedSources.make:
+ Add idl files.
+
+ * Modules/applepay/ApplePayError.cpp:
+ (WebCore::ApplePayError::create):
+ (WebCore::ApplePayError::ApplePayError):
+ (WebCore::ApplePayError::~ApplePayError):
+ * Modules/applepay/ApplePayError.h:
+ * Modules/applepay/ApplePayError.idl:
+ * Modules/applepay/ApplePayPaymentAuthorizationResult.h:
+ * Modules/applepay/ApplePayPaymentAuthorizationResult.idl:
+ * Modules/applepay/ApplePayPaymentMethodUpdate.h:
+ * Modules/applepay/ApplePayPaymentMethodUpdate.idl:
+ * Modules/applepay/ApplePayShippingContactUpdate.h:
+ * Modules/applepay/ApplePayShippingContactUpdate.idl:
+ * Modules/applepay/ApplePayShippingMethodUpdate.h:
+ * Modules/applepay/ApplePayShippingMethodUpdate.idl:
+ Add new files.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::toPaymentAuthorizationStatus):
+ Move this function to the top.
+
+ (WebCore::convertAndValidate):
+ Add new convertAndValidate functions.
+
+ (WebCore::ApplePaySession::completeShippingMethodSelection):
+ (WebCore::ApplePaySession::completeShippingContactSelection):
+ (WebCore::ApplePaySession::completePaymentMethodSelection):
+ (WebCore::ApplePaySession::completePayment):
+ * Modules/applepay/ApplePaySession.h:
+ * Modules/applepay/ApplePaySession.idl:
+ Implement the old functions in terms of the new functions.
+
+ * Modules/applepay/PaymentCoordinator.cpp:
+ * WebCore.xcodeproj/project.pbxproj:
+ Add new files.
+
2017-03-09 Yoav Weiss <[email protected]>
[link preload] Double downloads of preloaded CSS
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (213672 => 213673)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-03-09 22:34:52 UTC (rev 213673)
@@ -35,6 +35,11 @@
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
+
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -51,6 +56,18 @@
ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_IF_NOT_YES = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphone*] = $(ENABLE_APPLE_PAY_DELEGATE_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_DELEGATE_iphoneos = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_iphonesimulator = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphonesimulator10*] = ;
+
+DISABLE_APPLE_PAY_DELEGATE_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_DELEGATE[sdk=macosx*] = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_ = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO);
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_YES = ;
+
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -233,4 +250,4 @@
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT
) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM)
$(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_DELEGATE) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_L
OAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATIS
TICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(
ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
Modified: trunk/Source/WebCore/DerivedSources.make (213672 => 213673)
--- trunk/Source/WebCore/DerivedSources.make 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebCore/DerivedSources.make 2017-03-09 22:34:52 UTC (rev 213673)
@@ -79,18 +79,23 @@
JS_BINDING_IDLS = \
$(WebCore)/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl \
+ $(WebCore)/Modules/applepay/ApplePayError.idl \
$(WebCore)/Modules/applepay/ApplePayLineItem.idl \
$(WebCore)/Modules/applepay/ApplePayPayment.idl \
$(WebCore)/Modules/applepay/ApplePayPaymentAuthorizedEvent.idl \
+ $(WebCore)/Modules/applepay/ApplePayPaymentAuthorizationResult.idl \
$(WebCore)/Modules/applepay/ApplePayPaymentContact.idl \
$(WebCore)/Modules/applepay/ApplePayPaymentMethod.idl \
$(WebCore)/Modules/applepay/ApplePayPaymentMethodSelectedEvent.idl \
+ $(WebCore)/Modules/applepay/ApplePayPaymentMethodUpdate.idl \
$(WebCore)/Modules/applepay/ApplePayPaymentPass.idl \
$(WebCore)/Modules/applepay/ApplePayPaymentRequest.idl \
$(WebCore)/Modules/applepay/ApplePaySession.idl \
$(WebCore)/Modules/applepay/ApplePayShippingContactSelectedEvent.idl \
+ $(WebCore)/Modules/applepay/ApplePayShippingContactUpdate.idl \
$(WebCore)/Modules/applepay/ApplePayShippingMethod.idl \
$(WebCore)/Modules/applepay/ApplePayShippingMethodSelectedEvent.idl \
+ $(WebCore)/Modules/applepay/ApplePayShippingMethodUpdate.idl \
$(WebCore)/Modules/applepay/ApplePayValidateMerchantEvent.idl \
$(WebCore)/Modules/credentials/BasicCredential.idl \
$(WebCore)/Modules/credentials/CredentialData.idl \
Added: trunk/Source/WebCore/Modules/applepay/ApplePayError.cpp (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayError.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayError.cpp 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ApplePayError.h"
+
+#if ENABLE(APPLE_PAY)
+
+namespace WebCore {
+
+Ref<ApplePayError> ApplePayError::create(Code code, const String& message, std::optional<ContactField> contactField)
+{
+ return adoptRef(*new ApplePayError { code, message, contactField });
+}
+
+ApplePayError::ApplePayError(Code code, const String& message, std::optional<ContactField> contactField)
+ : m_code { code }
+ , m_message { message }
+ , m_contactField { contactField }
+{
+}
+
+ApplePayError::~ApplePayError()
+{
+}
+
+}
+
+#endif
Added: trunk/Source/WebCore/Modules/applepay/ApplePayError.h (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayError.h (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayError.h 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if ENABLE(APPLE_PAY)
+
+#include "PaymentRequest.h"
+#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class ApplePayError final : public RefCounted<ApplePayError> {
+public:
+ using Code = PaymentError::Code;
+ using ContactField = PaymentError::ContactField;
+
+ static Ref<ApplePayError> create(Code, const String& message, std::optional<ContactField>);
+ virtual ~ApplePayError();
+
+ Code code() const { return m_code; }
+ void setCode(Code code) { m_code = code; }
+
+ String message() const { return m_message; }
+ void setMessage(String&& message) { m_message = WTFMove(message); }
+
+ std::optional<ContactField> contactField() const { return m_contactField; }
+ void setContactField(std::optional<ContactField> contactField) { m_contactField = contactField; }
+
+private:
+ ApplePayError(Code, const String& message, std::optional<ContactField>);
+
+ Code m_code;
+ String m_message;
+ std::optional<ContactField> m_contactField;
+};
+
+}
+
+#endif
Added: trunk/Source/WebCore/Modules/applepay/ApplePayError.idl (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayError.idl (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayError.idl 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=APPLE_PAY_DELEGATE,
+] enum ApplePayErrorCode {
+ "unknown",
+ "shippingContactInvalid",
+ "billingContactInvalid",
+ "addressUnservicable"
+};
+
+[
+ Conditional=APPLE_PAY_DELEGATE,
+] enum ApplePayErrorContactField {
+ "phoneNumber",
+ "emailAddress",
+ "givenName",
+ "familyName",
+ "addressLines",
+ "locality",
+ "postalCode",
+ "administrativeArea",
+ "country",
+ "countryCode"
+};
+
+[
+ Constructor(ApplePayErrorCode errorCode, optional DOMString message = "", optional ApplePayErrorContactField contactField),
+ Conditional=APPLE_PAY,
+] interface ApplePayError {
+ attribute ApplePayErrorCode code;
+ attribute DOMString message;
+
+ attribute ApplePayErrorContactField? contactField;
+};
Added: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.h (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.h (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.h 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if ENABLE(APPLE_PAY)
+
+#include "ApplePayError.h"
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+struct ApplePayPaymentAuthorizationResult {
+ unsigned short status;
+ Vector<RefPtr<ApplePayError>> errors;
+};
+
+}
+
+#endif
Added: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=APPLE_PAY_DELEGATE,
+] dictionary ApplePayPaymentAuthorizationResult {
+ required unsigned short status;
+ sequence<ApplePayError> errors;
+};
Added: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.h (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.h (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.h 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if ENABLE(APPLE_PAY)
+
+#include "ApplePayLineItem.h"
+
+namespace WebCore {
+
+struct ApplePayPaymentMethodUpdate {
+ unsigned short status;
+
+ ApplePayLineItem newTotal;
+ Vector<ApplePayLineItem> newLineItems;
+};
+
+}
+
+#endif
Added: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=APPLE_PAY_DELEGATE,
+] dictionary ApplePayPaymentMethodUpdate {
+ required unsigned short status;
+
+ required ApplePayLineItem newTotal;
+ sequence<ApplePayLineItem> newLineItems;
+};
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (213672 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2017-03-09 22:34:52 UTC (rev 213673)
@@ -29,12 +29,16 @@
#if ENABLE(APPLE_PAY)
#include "ApplePayLineItem.h"
+#include "ApplePayPaymentAuthorizationResult.h"
#include "ApplePayPaymentAuthorizedEvent.h"
#include "ApplePayPaymentMethodSelectedEvent.h"
+#include "ApplePayPaymentMethodUpdate.h"
#include "ApplePayPaymentRequest.h"
#include "ApplePayShippingContactSelectedEvent.h"
+#include "ApplePayShippingContactUpdate.h"
#include "ApplePayShippingMethod.h"
#include "ApplePayShippingMethodSelectedEvent.h"
+#include "ApplePayShippingMethodUpdate.h"
#include "ApplePayValidateMerchantEvent.h"
#include "Document.h"
#include "DocumentLoader.h"
@@ -376,6 +380,140 @@
return WTFMove(result);
}
+
+static std::optional<PaymentAuthorizationStatus> toPaymentAuthorizationStatus(unsigned short status)
+{
+ switch (status) {
+ case ApplePaySession::STATUS_SUCCESS:
+ return PaymentAuthorizationStatus::Success;
+
+ case ApplePaySession::STATUS_FAILURE:
+ return PaymentAuthorizationStatus::Failure;
+
+ case ApplePaySession::STATUS_INVALID_BILLING_POSTAL_ADDRESS:
+ return PaymentAuthorizationStatus::InvalidBillingPostalAddress;
+
+ case ApplePaySession::STATUS_INVALID_SHIPPING_POSTAL_ADDRESS:
+ return PaymentAuthorizationStatus::InvalidShippingPostalAddress;
+
+ case ApplePaySession::STATUS_INVALID_SHIPPING_CONTACT:
+ return PaymentAuthorizationStatus::InvalidShippingContact;
+
+ case ApplePaySession::STATUS_PIN_REQUIRED:
+ return PaymentAuthorizationStatus::PINRequired;
+
+ case ApplePaySession::STATUS_PIN_INCORRECT:
+ return PaymentAuthorizationStatus::PINIncorrect;
+
+ case ApplePaySession::STATUS_PIN_LOCKOUT:
+ return PaymentAuthorizationStatus::PINLockout;
+
+ default:
+ return std::nullopt;
+ }
+}
+
+static ExceptionOr<PaymentAuthorizationResult> convertAndValidate(ApplePayPaymentAuthorizationResult&& result)
+{
+ PaymentAuthorizationResult convertedResult;
+
+ auto authorizationStatus = toPaymentAuthorizationStatus(result.status);
+ if (!authorizationStatus)
+ return Exception { INVALID_ACCESS_ERR };
+ convertedResult.status = *authorizationStatus;
+
+ return WTFMove(convertedResult);
+}
+
+static ExceptionOr<PaymentMethodUpdate> convertAndValidate(ApplePayPaymentMethodUpdate&& update)
+{
+ PaymentMethodUpdate convertedUpdate;
+
+ auto authorizationStatus = toPaymentAuthorizationStatus(update.status);
+ if (!authorizationStatus)
+ return Exception { INVALID_ACCESS_ERR };
+ convertedUpdate.status = *authorizationStatus;
+
+ auto convertedNewTotal = convertAndValidateTotal(WTFMove(update.newTotal));
+ if (convertedNewTotal.hasException())
+ return convertedNewTotal.releaseException();
+ convertedUpdate.newTotalAndLineItems.total = convertedNewTotal.releaseReturnValue();
+
+ // FIXME: Merge this validation into the validation we are doing above.
+ auto validatedTotal = PaymentRequestValidator::validateTotal(convertedUpdate.newTotalAndLineItems.total);
+ if (validatedTotal.hasException())
+ return validatedTotal.releaseException();
+
+ auto convertedNewLineItems = convertAndValidate(WTFMove(update.newLineItems));
+ if (convertedNewLineItems.hasException())
+ return convertedNewLineItems.releaseException();
+
+ convertedUpdate.newTotalAndLineItems.lineItems = convertedNewLineItems.releaseReturnValue();
+
+ return WTFMove(convertedUpdate);
+}
+
+static ExceptionOr<ShippingContactUpdate> convertAndValidate(ApplePayShippingContactUpdate&& update)
+{
+ ShippingContactUpdate convertedUpdate;
+
+ auto authorizationStatus = toPaymentAuthorizationStatus(update.status);
+ if (!authorizationStatus)
+ return Exception { INVALID_ACCESS_ERR };
+ convertedUpdate.status = *authorizationStatus;
+
+ auto convertedNewShippingMethods = convertAndValidate(WTFMove(update.newShippingMethods));
+ if (convertedNewShippingMethods.hasException())
+ return convertedNewShippingMethods.releaseException();
+ convertedUpdate.newShippingMethods = convertedNewShippingMethods.releaseReturnValue();
+
+ auto convertedNewTotal = convertAndValidateTotal(WTFMove(update.newTotal));
+ if (convertedNewTotal.hasException())
+ return convertedNewTotal.releaseException();
+ convertedUpdate.newTotalAndLineItems.total = convertedNewTotal.releaseReturnValue();
+
+ // FIXME: Merge this validation into the validation we are doing above.
+ auto validatedTotal = PaymentRequestValidator::validateTotal(convertedUpdate.newTotalAndLineItems.total);
+ if (validatedTotal.hasException())
+ return validatedTotal.releaseException();
+
+ auto convertedNewLineItems = convertAndValidate(WTFMove(update.newLineItems));
+ if (convertedNewLineItems.hasException())
+ return convertedNewLineItems.releaseException();
+ convertedUpdate.newTotalAndLineItems.lineItems = convertedNewLineItems.releaseReturnValue();
+
+ return WTFMove(convertedUpdate);
+}
+
+static ExceptionOr<ShippingMethodUpdate> convertAndValidate(ApplePayShippingMethodUpdate&& update)
+{
+ ShippingMethodUpdate convertedUpdate;
+
+ auto authorizationStatus = toPaymentAuthorizationStatus(update.status);
+ if (!authorizationStatus)
+ return Exception { INVALID_ACCESS_ERR };
+ convertedUpdate.status = *authorizationStatus;
+
+ auto convertedNewTotal = convertAndValidateTotal(WTFMove(update.newTotal));
+ if (convertedNewTotal.hasException())
+ return convertedNewTotal.releaseException();
+
+ convertedUpdate.newTotalAndLineItems.total = convertedNewTotal.releaseReturnValue();
+
+ // FIXME: Merge this validation into the validation we are doing above.
+ auto validatedTotal = PaymentRequestValidator::validateTotal(convertedUpdate.newTotalAndLineItems.total);
+ if (validatedTotal.hasException())
+ return validatedTotal.releaseException();
+
+ auto convertedNewLineItems = convertAndValidate(WTFMove(update.newLineItems));
+ if (convertedNewLineItems.hasException())
+ return convertedNewLineItems.releaseException();
+
+ convertedUpdate.newTotalAndLineItems.lineItems = convertedNewLineItems.releaseReturnValue();
+
+ return WTFMove(convertedUpdate);
+}
+
static bool isSecure(DocumentLoader& documentLoader)
{
if (!documentLoader.response().url().protocolIs("https"))
@@ -586,165 +724,65 @@
return { };
}
-static std::optional<PaymentAuthorizationStatus> toPaymentAuthorizationStatus(unsigned short status)
+ExceptionOr<void> ApplePaySession::completeShippingMethodSelection(ApplePayShippingMethodUpdate&& update)
{
- switch (status) {
- case ApplePaySession::STATUS_SUCCESS:
- return PaymentAuthorizationStatus::Success;
-
- case ApplePaySession::STATUS_FAILURE:
- return PaymentAuthorizationStatus::Failure;
-
- case ApplePaySession::STATUS_INVALID_BILLING_POSTAL_ADDRESS:
- return PaymentAuthorizationStatus::InvalidBillingPostalAddress;
-
- case ApplePaySession::STATUS_INVALID_SHIPPING_POSTAL_ADDRESS:
- return PaymentAuthorizationStatus::InvalidShippingPostalAddress;
-
- case ApplePaySession::STATUS_INVALID_SHIPPING_CONTACT:
- return PaymentAuthorizationStatus::InvalidShippingContact;
-
- case ApplePaySession::STATUS_PIN_REQUIRED:
- return PaymentAuthorizationStatus::PINRequired;
-
- case ApplePaySession::STATUS_PIN_INCORRECT:
- return PaymentAuthorizationStatus::PINIncorrect;
-
- case ApplePaySession::STATUS_PIN_LOCKOUT:
- return PaymentAuthorizationStatus::PINLockout;
-
- default:
- return std::nullopt;
- }
-}
-
-ExceptionOr<void> ApplePaySession::completeShippingMethodSelection(unsigned short status, ApplePayLineItem&& newTotal, Vector<ApplePayLineItem>&& newLineItems)
-{
if (!canCompleteShippingMethodSelection())
return Exception { INVALID_ACCESS_ERR };
- auto authorizationStatus = toPaymentAuthorizationStatus(status);
- if (!authorizationStatus)
- return Exception { INVALID_ACCESS_ERR };
+ auto convertedUpdate = convertAndValidate(WTFMove(update));
+ if (convertedUpdate.hasException())
+ return convertedUpdate.releaseException();
- auto convertedNewTotal = convertAndValidateTotal(WTFMove(newTotal));
- if (convertedNewTotal.hasException())
- return convertedNewTotal.releaseException();
-
- PaymentRequest::TotalAndLineItems totalAndLineItems;
- totalAndLineItems.total = convertedNewTotal.releaseReturnValue();
-
- // FIXME: Merge this validation into the validation we are doing above.
- auto validatedTotal = PaymentRequestValidator::validateTotal(totalAndLineItems.total);
- if (validatedTotal.hasException())
- return validatedTotal.releaseException();
-
- auto convertedNewLineItems = convertAndValidate(WTFMove(newLineItems));
- if (convertedNewLineItems.hasException())
- return convertedNewLineItems.releaseException();
-
- totalAndLineItems.lineItems = convertedNewLineItems.releaseReturnValue();
-
- ShippingMethodUpdate update;
- update.status = *authorizationStatus;
- update.newTotalAndLineItems = WTFMove(totalAndLineItems);
-
m_state = State::Active;
- paymentCoordinator().completeShippingMethodSelection(WTFMove(update));
+ paymentCoordinator().completeShippingMethodSelection(convertedUpdate.releaseReturnValue());
return { };
}
-ExceptionOr<void> ApplePaySession::completeShippingContactSelection(unsigned short status, Vector<ApplePayShippingMethod>&& newShippingMethods, ApplePayLineItem&& newTotal, Vector<ApplePayLineItem>&& newLineItems)
+ExceptionOr<void> ApplePaySession::completeShippingContactSelection(ApplePayShippingContactUpdate&& update)
{
if (!canCompleteShippingContactSelection())
return Exception { INVALID_ACCESS_ERR };
- auto authorizationStatus = toPaymentAuthorizationStatus(status);
- if (!authorizationStatus)
- return Exception { INVALID_ACCESS_ERR };
+ auto convertedUpdate = convertAndValidate(WTFMove(update));
+ if (convertedUpdate.hasException())
+ return convertedUpdate.releaseException();
- auto convertedNewShippingMethods = convertAndValidate(WTFMove(newShippingMethods));
- if (convertedNewShippingMethods.hasException())
- return convertedNewShippingMethods.releaseException();
-
- auto convertedNewTotal = convertAndValidateTotal(WTFMove(newTotal));
- if (convertedNewTotal.hasException())
- return convertedNewTotal.releaseException();
-
- PaymentRequest::TotalAndLineItems totalAndLineItems;
- totalAndLineItems.total = convertedNewTotal.releaseReturnValue();
-
- // FIXME: Merge this validation into the validation we are doing above.
- auto validatedTotal = PaymentRequestValidator::validateTotal(totalAndLineItems.total);
- if (validatedTotal.hasException())
- return validatedTotal.releaseException();
-
- auto convertedNewLineItems = convertAndValidate(WTFMove(newLineItems));
- if (convertedNewLineItems.hasException())
- return convertedNewLineItems.releaseException();
-
- totalAndLineItems.lineItems = convertedNewLineItems.releaseReturnValue();
-
- ShippingContactUpdate update;
- update.status = *authorizationStatus;
- update.newShippingMethods = convertedNewShippingMethods.releaseReturnValue();
- update.newTotalAndLineItems = WTFMove(totalAndLineItems);
-
m_state = State::Active;
- paymentCoordinator().completeShippingContactSelection(WTFMove(update));
+ paymentCoordinator().completeShippingContactSelection(convertedUpdate.releaseReturnValue());
return { };
}
-ExceptionOr<void> ApplePaySession::completePaymentMethodSelection(ApplePayLineItem&& newTotal, Vector<ApplePayLineItem>&& newLineItems)
+ExceptionOr<void> ApplePaySession::completePaymentMethodSelection(ApplePayPaymentMethodUpdate&& update)
{
if (!canCompletePaymentMethodSelection())
return Exception { INVALID_ACCESS_ERR };
- auto convertedNewTotal = convertAndValidateTotal(WTFMove(newTotal));
- if (convertedNewTotal.hasException())
- return convertedNewTotal.releaseException();
+ auto convertedUpdate = convertAndValidate(WTFMove(update));
+ if (convertedUpdate.hasException())
+ return convertedUpdate.releaseException();
- PaymentRequest::TotalAndLineItems totalAndLineItems;
- totalAndLineItems.total = convertedNewTotal.releaseReturnValue();
-
- // FIXME: Merge this validation into the validation we are doing above.
- auto validatedTotal = PaymentRequestValidator::validateTotal(totalAndLineItems.total);
- if (validatedTotal.hasException())
- return validatedTotal.releaseException();
-
- auto convertedNewLineItems = convertAndValidate(WTFMove(newLineItems));
- if (convertedNewLineItems.hasException())
- return convertedNewLineItems.releaseException();
-
- totalAndLineItems.lineItems = convertedNewLineItems.releaseReturnValue();
-
- PaymentMethodUpdate update;
- update.status = PaymentAuthorizationStatus::Success;
- update.newTotalAndLineItems = WTFMove(totalAndLineItems);
-
m_state = State::Active;
- paymentCoordinator().completePaymentMethodSelection(WTFMove(update));
+ paymentCoordinator().completePaymentMethodSelection(convertedUpdate.releaseReturnValue());
return { };
}
-ExceptionOr<void> ApplePaySession::completePayment(unsigned short status)
+ExceptionOr<void> ApplePaySession::completePayment(ApplePayPaymentAuthorizationResult&& result)
{
if (!canCompletePayment())
return Exception { INVALID_ACCESS_ERR };
- auto authorizationStatus = toPaymentAuthorizationStatus(status);
- if (!authorizationStatus)
- return Exception { INVALID_ACCESS_ERR };
+ auto convertedResult = convertAndValidate(WTFMove(result));
+ if (convertedResult.hasException())
+ return convertedResult.releaseException();
- PaymentAuthorizationResult result;
- result.status = *authorizationStatus;
+ auto authorizationStatus = convertedResult.releaseReturnValue().status;
- paymentCoordinator().completePaymentSession(WTFMove(result));
+ paymentCoordinator().completePaymentSession(convertedResult.releaseReturnValue());
- if (!isFinalStateStatus(*authorizationStatus)) {
+ if (!isFinalStateStatus(authorizationStatus)) {
m_state = State::Active;
return { };
}
@@ -751,9 +789,52 @@
m_state = State::Completed;
unsetPendingActivity(this);
+
return { };
}
+ExceptionOr<void> ApplePaySession::completeShippingMethodSelection(unsigned short status, ApplePayLineItem&& newTotal, Vector<ApplePayLineItem>&& newLineItems)
+{
+ ApplePayShippingMethodUpdate update;
+
+ update.status = status;
+ update.newTotal = WTFMove(newTotal);
+ update.newLineItems = WTFMove(newLineItems);
+
+ return completeShippingMethodSelection(WTFMove(update));
+}
+
+ExceptionOr<void> ApplePaySession::completeShippingContactSelection(unsigned short status, Vector<ApplePayShippingMethod>&& newShippingMethods, ApplePayLineItem&& newTotal, Vector<ApplePayLineItem>&& newLineItems)
+{
+ ApplePayShippingContactUpdate update;
+
+ update.status = status;
+ update.newShippingMethods = WTFMove(newShippingMethods);
+ update.newTotal = WTFMove(newTotal);
+ update.newLineItems = WTFMove(newLineItems);
+
+ return completeShippingContactSelection(WTFMove(update));
+}
+
+ExceptionOr<void> ApplePaySession::completePaymentMethodSelection(ApplePayLineItem&& newTotal, Vector<ApplePayLineItem>&& newLineItems)
+{
+ ApplePayPaymentMethodUpdate update;
+
+ update.status = STATUS_SUCCESS;
+ update.newTotal = WTFMove(newTotal);
+ update.newLineItems = WTFMove(newLineItems);
+
+ return completePaymentMethodSelection(WTFMove(update));
+}
+
+ExceptionOr<void> ApplePaySession::completePayment(unsigned short status)
+{
+ ApplePayPaymentAuthorizationResult result;
+ result.status = status;
+
+ return completePayment(WTFMove(result));
+}
+
void ApplePaySession::validateMerchant(const URL& validationURL)
{
if (m_state == State::Aborted) {
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.h (213672 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2017-03-09 22:34:52 UTC (rev 213673)
@@ -48,10 +48,14 @@
class PaymentCoordinator;
class PaymentMethod;
class URL;
-
+enum class PaymentAuthorizationStatus;
struct ApplePayLineItem;
struct ApplePayPaymentRequest;
struct ApplePayShippingMethod;
+struct ApplePayPaymentAuthorizationResult;
+struct ApplePayPaymentMethodUpdate;
+struct ApplePayShippingContactUpdate;
+struct ApplePayShippingMethodUpdate;
class ApplePaySession final : public RefCounted<ApplePaySession>, public ActiveDOMObject, public EventTargetWithInlineData {
public:
@@ -75,6 +79,12 @@
ExceptionOr<void> begin();
ExceptionOr<void> abort();
ExceptionOr<void> completeMerchantValidation(JSC::ExecState&, JSC::JSValue merchantSession);
+ ExceptionOr<void> completeShippingMethodSelection(ApplePayShippingMethodUpdate&&);
+ ExceptionOr<void> completeShippingContactSelection(ApplePayShippingContactUpdate&&);
+ ExceptionOr<void> completePaymentMethodSelection(ApplePayPaymentMethodUpdate&&);
+ ExceptionOr<void> completePayment(ApplePayPaymentAuthorizationResult&&);
+
+ // Old functions.
ExceptionOr<void> completeShippingMethodSelection(unsigned short status, ApplePayLineItem&& newTotal, Vector<ApplePayLineItem>&& newLineItems);
ExceptionOr<void> completeShippingContactSelection(unsigned short status, Vector<ApplePayShippingMethod>&& newShippingMethods, ApplePayLineItem&& newTotal, Vector<ApplePayLineItem>&& newLineItems);
ExceptionOr<void> completePaymentMethodSelection(ApplePayLineItem&& newTotal, Vector<ApplePayLineItem>&& newLineItems);
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl (213672 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2017-03-09 22:34:52 UTC (rev 213673)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -25,7 +25,7 @@
[
ActiveDOMObject,
- Conditional=APPLE_PAY,
+ Conditional=APPLE_PAY_DELEGATE,
Constructor(unsigned long version, ApplePayPaymentRequest paymentRequest),
ConstructorCallWith=Document,
ConstructorMayThrowException,
@@ -48,6 +48,11 @@
[MayThrowException] void begin();
[MayThrowException] void abort();
[MayThrowException, CallWith=ScriptState] void completeMerchantValidation(any merchantSession);
+ [MayThrowException, Conditional=APPLE_PAY_DELEGATE] void completeShippingMethodSelection(ApplePayShippingMethodUpdate update);
+ [MayThrowException, Conditional=APPLE_PAY_DELEGATE] void completeShippingContactSelection(ApplePayShippingContactUpdate update);
+ [MayThrowException, Conditional=APPLE_PAY_DELEGATE] void completePaymentMethodSelection(ApplePayPaymentMethodUpdate update);
+ [MayThrowException, Conditional=APPLE_PAY_DELEGATE] void completePayment(ApplePayPaymentAuthorizationResult result);
+
[MayThrowException] void completeShippingMethodSelection(unsigned short status, ApplePayLineItem newTotal, sequence<ApplePayLineItem> newLineItems);
[MayThrowException] void completeShippingContactSelection(unsigned short status, sequence<ApplePayShippingMethod> newShippingMethods, ApplePayLineItem newTotal, sequence<ApplePayLineItem> newLineItems);
[MayThrowException] void completePaymentMethodSelection(ApplePayLineItem newTotal, sequence<ApplePayLineItem> newLineItems);
Added: trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.h (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.h (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.h 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if ENABLE(APPLE_PAY)
+
+#include "ApplePayError.h"
+#include "ApplePayLineItem.h"
+#include "ApplePayShippingMethod.h"
+
+namespace WebCore {
+
+struct ApplePayShippingContactUpdate {
+ unsigned short status;
+ Vector<RefPtr<ApplePayError>> errors;
+
+ Vector<ApplePayShippingMethod> newShippingMethods;
+ ApplePayLineItem newTotal;
+ Vector<ApplePayLineItem> newLineItems;
+};
+
+}
+
+#endif
Added: trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.idl (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.idl (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.idl 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=APPLE_PAY_DELEGATE,
+] dictionary ApplePayShippingContactUpdate {
+ required unsigned short status;
+ sequence<ApplePayError> errors;
+
+ sequence<ApplePayShippingMethod> newShippingMethods;
+ required ApplePayLineItem newTotal;
+ sequence<ApplePayLineItem> newLineItems;
+};
Added: trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.h (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.h (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.h 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if ENABLE(APPLE_PAY)
+
+#include "ApplePayLineItem.h"
+
+namespace WebCore {
+
+struct ApplePayShippingMethodUpdate {
+ unsigned short status;
+
+ ApplePayLineItem newTotal;
+ Vector<ApplePayLineItem> newLineItems;
+};
+
+}
+
+#endif
Added: trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl (0 => 213673)
--- trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl (rev 0)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl 2017-03-09 22:34:52 UTC (rev 213673)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=APPLE_PAY_DELEGATE,
+] dictionary ApplePayShippingMethodUpdate {
+ required unsigned short status;
+
+ required ApplePayLineItem newTotal;
+ sequence<ApplePayLineItem> newLineItems;
+};
Modified: trunk/Source/WebCore/PAL/ChangeLog (213672 => 213673)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-03-09 22:34:52 UTC (rev 213673)
@@ -1,3 +1,14 @@
+2017-03-09 Anders Carlsson <[email protected]>
+
+ Add delegate support to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=169427
+ Part of rdar://problem/28880714.
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+ Add feature define.
+
2017-03-07 Dean Jackson <[email protected]>
Some platforms won't be able to create a GPUDevice
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (213672 => 213673)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-03-09 22:34:52 UTC (rev 213673)
@@ -35,6 +35,11 @@
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
+
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -51,6 +56,18 @@
ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_IF_NOT_YES = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphone*] = $(ENABLE_APPLE_PAY_DELEGATE_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_DELEGATE_iphoneos = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_iphonesimulator = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphonesimulator10*] = ;
+
+DISABLE_APPLE_PAY_DELEGATE_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_DELEGATE[sdk=macosx*] = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_ = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO);
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_YES = ;
+
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -233,4 +250,4 @@
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT
) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM)
$(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_DELEGATE) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_L
OAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATIS
TICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(
ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (213672 => 213673)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-09 22:34:52 UTC (rev 213673)
@@ -892,6 +892,12 @@
1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AD8F81C11CAB9E900E93E54 /* PlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */; };
1ADA4A1C1D22F2C0005A9A15 /* PaymentMerchantSessionCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ADA4A1B1D22F2C0005A9A15 /* PaymentMerchantSessionCocoa.mm */; };
+ 1ADFDFE01E71D8EE008F5D34 /* ApplePayError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFDFD51E71D8DF008F5D34 /* ApplePayError.cpp */; };
+ 1ADFDFEC1E71E455008F5D34 /* JSApplePayError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFDFE11E71DCA0008F5D34 /* JSApplePayError.cpp */; };
+ 1ADFDFED1E71E475008F5D34 /* JSApplePayPaymentMethodUpdate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFDFE51E71DCA0008F5D34 /* JSApplePayPaymentMethodUpdate.cpp */; };
+ 1ADFDFEE1E71E47C008F5D34 /* JSApplePayShippingMethodUpdate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFDFE91E71DCA0008F5D34 /* JSApplePayShippingMethodUpdate.cpp */; };
+ 1ADFDFEF1E71E483008F5D34 /* JSApplePayShippingContactUpdate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFDFE71E71DCA0008F5D34 /* JSApplePayShippingContactUpdate.cpp */; };
+ 1ADFDFF01E71E4AC008F5D34 /* JSApplePayPaymentAuthorizationResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFDFE31E71DCA0008F5D34 /* JSApplePayPaymentAuthorizationResult.cpp */; };
1AE00D59182DAC8D00087DD7 /* KeyedCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D57182DAC8D00087DD7 /* KeyedCoding.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AE2AA1E0A1CDAB400B42B25 /* JSHTMLAreaElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE2AA0A0A1CDAB300B42B25 /* JSHTMLAreaElement.cpp */; };
1AE2AA1F0A1CDAB400B42B25 /* JSHTMLAreaElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE2AA0B0A1CDAB300B42B25 /* JSHTMLAreaElement.h */; };
@@ -8140,6 +8146,27 @@
1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformStrategies.h; sourceTree = "<group>"; };
1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformStrategies.cpp; sourceTree = "<group>"; };
1ADA4A1B1D22F2C0005A9A15 /* PaymentMerchantSessionCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PaymentMerchantSessionCocoa.mm; sourceTree = "<group>"; };
+ 1ADFDFD51E71D8DF008F5D34 /* ApplePayError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplePayError.cpp; sourceTree = "<group>"; };
+ 1ADFDFD61E71D8DF008F5D34 /* ApplePayError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplePayError.h; sourceTree = "<group>"; };
+ 1ADFDFD71E71D8DF008F5D34 /* ApplePayError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ApplePayError.idl; sourceTree = "<group>"; };
+ 1ADFDFD81E71D8DF008F5D34 /* ApplePayPaymentAuthorizationResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplePayPaymentAuthorizationResult.h; sourceTree = "<group>"; };
+ 1ADFDFD91E71D8DF008F5D34 /* ApplePayPaymentAuthorizationResult.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ApplePayPaymentAuthorizationResult.idl; sourceTree = "<group>"; };
+ 1ADFDFDA1E71D8DF008F5D34 /* ApplePayPaymentMethodUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplePayPaymentMethodUpdate.h; sourceTree = "<group>"; };
+ 1ADFDFDB1E71D8DF008F5D34 /* ApplePayPaymentMethodUpdate.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ApplePayPaymentMethodUpdate.idl; sourceTree = "<group>"; };
+ 1ADFDFDC1E71D8DF008F5D34 /* ApplePayShippingContactUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplePayShippingContactUpdate.h; sourceTree = "<group>"; };
+ 1ADFDFDD1E71D8DF008F5D34 /* ApplePayShippingContactUpdate.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ApplePayShippingContactUpdate.idl; sourceTree = "<group>"; };
+ 1ADFDFDE1E71D8DF008F5D34 /* ApplePayShippingMethodUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplePayShippingMethodUpdate.h; sourceTree = "<group>"; };
+ 1ADFDFDF1E71D8DF008F5D34 /* ApplePayShippingMethodUpdate.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ApplePayShippingMethodUpdate.idl; sourceTree = "<group>"; };
+ 1ADFDFE11E71DCA0008F5D34 /* JSApplePayError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSApplePayError.cpp; sourceTree = "<group>"; };
+ 1ADFDFE21E71DCA0008F5D34 /* JSApplePayError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSApplePayError.h; sourceTree = "<group>"; };
+ 1ADFDFE31E71DCA0008F5D34 /* JSApplePayPaymentAuthorizationResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSApplePayPaymentAuthorizationResult.cpp; sourceTree = "<group>"; };
+ 1ADFDFE41E71DCA0008F5D34 /* JSApplePayPaymentAuthorizationResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSApplePayPaymentAuthorizationResult.h; sourceTree = "<group>"; };
+ 1ADFDFE51E71DCA0008F5D34 /* JSApplePayPaymentMethodUpdate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSApplePayPaymentMethodUpdate.cpp; sourceTree = "<group>"; };
+ 1ADFDFE61E71DCA0008F5D34 /* JSApplePayPaymentMethodUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSApplePayPaymentMethodUpdate.h; sourceTree = "<group>"; };
+ 1ADFDFE71E71DCA0008F5D34 /* JSApplePayShippingContactUpdate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSApplePayShippingContactUpdate.cpp; sourceTree = "<group>"; };
+ 1ADFDFE81E71DCA0008F5D34 /* JSApplePayShippingContactUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSApplePayShippingContactUpdate.h; sourceTree = "<group>"; };
+ 1ADFDFE91E71DCA0008F5D34 /* JSApplePayShippingMethodUpdate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSApplePayShippingMethodUpdate.cpp; sourceTree = "<group>"; };
+ 1ADFDFEA1E71DCA0008F5D34 /* JSApplePayShippingMethodUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSApplePayShippingMethodUpdate.h; sourceTree = "<group>"; };
1AE00D57182DAC8D00087DD7 /* KeyedCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyedCoding.h; sourceTree = "<group>"; };
1AE2A9F00A1CDA5700B42B25 /* HTMLAreaElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = HTMLAreaElement.idl; sourceTree = "<group>"; };
1AE2A9F20A1CDA5700B42B25 /* HTMLBodyElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = HTMLBodyElement.idl; sourceTree = "<group>"; };
@@ -16264,10 +16291,15 @@
isa = PBXGroup;
children = (
1A58E8691D19D8C000C0EA73 /* cocoa */,
+ 1ADFDFD51E71D8DF008F5D34 /* ApplePayError.cpp */,
+ 1ADFDFD61E71D8DF008F5D34 /* ApplePayError.h */,
+ 1ADFDFD71E71D8DF008F5D34 /* ApplePayError.idl */,
7C6579E21E00827000E3A27A /* ApplePayLineItem.h */,
7C6579E41E0082C800E3A27A /* ApplePayLineItem.idl */,
7C6522FE1E00D03400677F22 /* ApplePayPayment.h */,
7C6522FF1E00D03400677F22 /* ApplePayPayment.idl */,
+ 1ADFDFD81E71D8DF008F5D34 /* ApplePayPaymentAuthorizationResult.h */,
+ 1ADFDFD91E71D8DF008F5D34 /* ApplePayPaymentAuthorizationResult.idl */,
1A8A643D1D19FCFB00D0E00F /* ApplePayPaymentAuthorizedEvent.cpp */,
1A8A643E1D19FCFB00D0E00F /* ApplePayPaymentAuthorizedEvent.h */,
1A8A643F1D19FCFB00D0E00F /* ApplePayPaymentAuthorizedEvent.idl */,
@@ -16278,6 +16310,8 @@
1A8A64401D19FCFB00D0E00F /* ApplePayPaymentMethodSelectedEvent.cpp */,
1A8A64421D19FCFB00D0E00F /* ApplePayPaymentMethodSelectedEvent.h */,
1A8A64431D19FCFB00D0E00F /* ApplePayPaymentMethodSelectedEvent.idl */,
+ 1ADFDFDA1E71D8DF008F5D34 /* ApplePayPaymentMethodUpdate.h */,
+ 1ADFDFDB1E71D8DF008F5D34 /* ApplePayPaymentMethodUpdate.idl */,
7C6522F21E00A51700677F22 /* ApplePayPaymentPass.h */,
7C6522F31E00A51700677F22 /* ApplePayPaymentPass.idl */,
7C6579DF1E0079F900E3A27A /* ApplePayPaymentRequest.h */,
@@ -16288,11 +16322,15 @@
1A8A64471D19FCFB00D0E00F /* ApplePayShippingContactSelectedEvent.cpp */,
1A8A64481D19FCFB00D0E00F /* ApplePayShippingContactSelectedEvent.h */,
1A8A64491D19FCFB00D0E00F /* ApplePayShippingContactSelectedEvent.idl */,
+ 1ADFDFDC1E71D8DF008F5D34 /* ApplePayShippingContactUpdate.h */,
+ 1ADFDFDD1E71D8DF008F5D34 /* ApplePayShippingContactUpdate.idl */,
7C6579E71E00831600E3A27A /* ApplePayShippingMethod.h */,
7C6579E51E00830600E3A27A /* ApplePayShippingMethod.idl */,
1A8A644B1D19FCFB00D0E00F /* ApplePayShippingMethodSelectedEvent.cpp */,
1A8A644C1D19FCFB00D0E00F /* ApplePayShippingMethodSelectedEvent.h */,
1A8A644D1D19FCFB00D0E00F /* ApplePayShippingMethodSelectedEvent.idl */,
+ 1ADFDFDE1E71D8DF008F5D34 /* ApplePayShippingMethodUpdate.h */,
+ 1ADFDFDF1E71D8DF008F5D34 /* ApplePayShippingMethodUpdate.idl */,
1A8A644E1D19FCFB00D0E00F /* ApplePayValidateMerchantEvent.cpp */,
1A8A644F1D19FCFB00D0E00F /* ApplePayValidateMerchantEvent.h */,
1A8A64501D19FCFB00D0E00F /* ApplePayValidateMerchantEvent.idl */,
@@ -16414,10 +16452,14 @@
1AE96A791D1A0A5C00B86768 /* ApplePay */ = {
isa = PBXGroup;
children = (
+ 1ADFDFE11E71DCA0008F5D34 /* JSApplePayError.cpp */,
+ 1ADFDFE21E71DCA0008F5D34 /* JSApplePayError.h */,
7C6579E91E00856600E3A27A /* JSApplePayLineItem.cpp */,
7C6579EA1E00856600E3A27A /* JSApplePayLineItem.h */,
7C65231D1E018B5A00677F22 /* JSApplePayPayment.cpp */,
7C65230A1E00DBB400677F22 /* JSApplePayPayment.h */,
+ 1ADFDFE31E71DCA0008F5D34 /* JSApplePayPaymentAuthorizationResult.cpp */,
+ 1ADFDFE41E71DCA0008F5D34 /* JSApplePayPaymentAuthorizationResult.h */,
1AE96A7A1D1A0A8000B86768 /* JSApplePayPaymentAuthorizedEvent.cpp */,
1AE96A7B1D1A0A8000B86768 /* JSApplePayPaymentAuthorizedEvent.h */,
7C65230B1E00DBB400677F22 /* JSApplePayPaymentContact.cpp */,
@@ -16426,6 +16468,8 @@
7C65230E1E00DBB400677F22 /* JSApplePayPaymentMethod.h */,
1AE96A7C1D1A0A8000B86768 /* JSApplePayPaymentMethodSelectedEvent.cpp */,
1AE96A7D1D1A0A8000B86768 /* JSApplePayPaymentMethodSelectedEvent.h */,
+ 1ADFDFE51E71DCA0008F5D34 /* JSApplePayPaymentMethodUpdate.cpp */,
+ 1ADFDFE61E71DCA0008F5D34 /* JSApplePayPaymentMethodUpdate.h */,
7C65230F1E00DBB400677F22 /* JSApplePayPaymentPass.cpp */,
7C6523101E00DBB400677F22 /* JSApplePayPaymentPass.h */,
7C6579EB1E00856600E3A27A /* JSApplePayPaymentRequest.cpp */,
@@ -16434,10 +16478,14 @@
1AE96A7F1D1A0A8000B86768 /* JSApplePaySession.h */,
1AE96A801D1A0A8000B86768 /* JSApplePayShippingContactSelectedEvent.cpp */,
1AE96A811D1A0A8000B86768 /* JSApplePayShippingContactSelectedEvent.h */,
+ 1ADFDFE71E71DCA0008F5D34 /* JSApplePayShippingContactUpdate.cpp */,
+ 1ADFDFE81E71DCA0008F5D34 /* JSApplePayShippingContactUpdate.h */,
7C6579ED1E00856600E3A27A /* JSApplePayShippingMethod.cpp */,
7C6579EE1E00856600E3A27A /* JSApplePayShippingMethod.h */,
1AE96A821D1A0A8000B86768 /* JSApplePayShippingMethodSelectedEvent.cpp */,
1AE96A831D1A0A8000B86768 /* JSApplePayShippingMethodSelectedEvent.h */,
+ 1ADFDFE91E71DCA0008F5D34 /* JSApplePayShippingMethodUpdate.cpp */,
+ 1ADFDFEA1E71DCA0008F5D34 /* JSApplePayShippingMethodUpdate.h */,
1AE96A841D1A0A8000B86768 /* JSApplePayValidateMerchantEvent.cpp */,
);
name = ApplePay;
@@ -29686,6 +29734,7 @@
FD35918F138DB22000E1EBEC /* AudioParamTimeline.cpp in Sources */,
FD31601F12B0267600C1A359 /* AudioProcessingEvent.cpp in Sources */,
FD31608512B026F700C1A359 /* AudioResampler.cpp in Sources */,
+ 1ADFDFF01E71E4AC008F5D34 /* JSApplePayPaymentAuthorizationResult.cpp in Sources */,
FD31608712B026F700C1A359 /* AudioResamplerKernel.cpp in Sources */,
073B87661E4385AC0071C0EC /* AudioSampleBufferList.cpp in Sources */,
073B87681E4385AC0071C0EC /* AudioSampleDataSource.mm in Sources */,
@@ -29865,6 +29914,7 @@
CE799FAB1C6A50660097B518 /* ContentSecurityPolicySourceListDirective.cpp in Sources */,
41D015CB0F4B5C71004A662F /* ContentType.cpp in Sources */,
97627B8D14FB3CEE002CDCA1 /* ContextDestructionObserver.cpp in Sources */,
+ 1ADFDFE01E71D8EE008F5D34 /* ApplePayError.cpp in Sources */,
1AB40EE21BF427DB00BA81BE /* ContextMenu.cpp in Sources */,
5106D7BD18BDB76F000AB166 /* ContextMenuContext.cpp in Sources */,
065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */,
@@ -29966,6 +30016,7 @@
A80E6D020A1989CA007FB8C5 /* CSSInitialValue.cpp in Sources */,
31288E720E3005D6003619AE /* CSSKeyframeRule.cpp in Sources */,
31288E740E3005D6003619AE /* CSSKeyframesRule.cpp in Sources */,
+ 1ADFDFEF1E71E483008F5D34 /* JSApplePayShippingContactUpdate.cpp in Sources */,
BC772E16133162C2001EC9CE /* CSSLineBoxContainValue.cpp in Sources */,
41DEFCB51E56C1BD000D9E5F /* JSDOMMapLike.cpp in Sources */,
946D37491D6D06280077084F /* CSSMarkup.cpp in Sources */,
@@ -30402,6 +30453,7 @@
977B386E122883E900B81FF8 /* HTMLFormattingElementList.cpp in Sources */,
A81369CF097374F600D74463 /* HTMLFormControlElement.cpp in Sources */,
E14F1C4414B5DAC600EA9009 /* HTMLFormControlElementWithState.cpp in Sources */,
+ 1ADFDFEE1E71E47C008F5D34 /* JSApplePayShippingMethodUpdate.cpp in Sources */,
A8DF3FCF097FA0FC0052981B /* HTMLFormControlsCollection.cpp in Sources */,
A81369D1097374F600D74463 /* HTMLFormElement.cpp in Sources */,
A871DE230A152AC800B12A68 /* HTMLFrameElement.cpp in Sources */,
@@ -31450,6 +31502,7 @@
CBA9DC0A1DF44DF10005675C /* LinkHeader.cpp in Sources */,
1A4DA4211CDD3A8300F4473C /* LinkIconCollector.cpp in Sources */,
98CE4326129E00BD005821DC /* LinkLoader.cpp in Sources */,
+ 1ADFDFEC1E71E455008F5D34 /* JSApplePayError.cpp in Sources */,
CB61C7931D755207001ADC7D /* LinkPreloadResourceClients.cpp in Sources */,
985BB96D13A94058007A0B69 /* LinkRelAttribute.cpp in Sources */,
BC7FA6200D1F0CBD00DB22A9 /* LiveNodeList.cpp in Sources */,
@@ -31854,6 +31907,7 @@
A871DED40A1530C700B12A68 /* RenderFrame.cpp in Sources */,
0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */,
A871DED20A1530C700B12A68 /* RenderFrameSet.cpp in Sources */,
+ 1ADFDFED1E71E475008F5D34 /* JSApplePayPaymentMethodUpdate.cpp in Sources */,
CDEA7C851276230400B846DD /* RenderFullScreen.cpp in Sources */,
0F3F0E59157030C3006DA57F /* RenderGeometryMap.cpp in Sources */,
BC128B01137C8D4600CAC845 /* RenderGrid.cpp in Sources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (213672 => 213673)
--- trunk/Source/WebKit/mac/ChangeLog 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-03-09 22:34:52 UTC (rev 213673)
@@ -1,3 +1,14 @@
+2017-03-09 Anders Carlsson <[email protected]>
+
+ Add delegate support to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=169427
+ Part of rdar://problem/28880714.
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+ Add feature define.
+
2017-03-08 Megan Gardner <[email protected]>
Fix DataInteraction guards
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (213672 => 213673)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-03-09 22:34:52 UTC (rev 213673)
@@ -35,6 +35,11 @@
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
+
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -51,6 +56,18 @@
ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_IF_NOT_YES = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphone*] = $(ENABLE_APPLE_PAY_DELEGATE_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_DELEGATE_iphoneos = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_iphonesimulator = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphonesimulator10*] = ;
+
+DISABLE_APPLE_PAY_DELEGATE_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_DELEGATE[sdk=macosx*] = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_ = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO);
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_YES = ;
+
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -233,4 +250,4 @@
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT
) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM)
$(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_DELEGATE) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_L
OAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATIS
TICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(
ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
Modified: trunk/Source/WebKit2/ChangeLog (213672 => 213673)
--- trunk/Source/WebKit2/ChangeLog 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-09 22:34:52 UTC (rev 213673)
@@ -1,3 +1,14 @@
+2017-03-09 Anders Carlsson <[email protected]>
+
+ Add delegate support to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=169427
+ Part of rdar://problem/28880714.
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+ Add feature define.
+
2017-03-09 Alex Christensen <[email protected]>
[Content Extensions] Introduce if-top-url and unless-top-url
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (213672 => 213673)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-03-09 22:34:52 UTC (rev 213673)
@@ -35,6 +35,11 @@
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
+
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -51,6 +56,18 @@
ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_IF_NOT_YES = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphone*] = $(ENABLE_APPLE_PAY_DELEGATE_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_DELEGATE_iphoneos = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_iphonesimulator = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphonesimulator10*] = ;
+
+DISABLE_APPLE_PAY_DELEGATE_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_DELEGATE[sdk=macosx*] = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_ = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO);
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_YES = ;
+
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -233,4 +250,4 @@
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT
) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM)
$(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_DELEGATE) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_L
OAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATIS
TICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(
ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
Modified: trunk/Tools/ChangeLog (213672 => 213673)
--- trunk/Tools/ChangeLog 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Tools/ChangeLog 2017-03-09 22:34:52 UTC (rev 213673)
@@ -1,3 +1,13 @@
+2017-03-09 Anders Carlsson <[email protected]>
+
+ Add delegate support to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=169427
+ Part of rdar://problem/28880714.
+
+ Reviewed by Geoffrey Garen.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2017-03-09 Alex Christensen <[email protected]>
[Content Extensions] Introduce if-top-url and unless-top-url
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (213672 => 213673)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-03-09 22:29:39 UTC (rev 213672)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-03-09 22:34:52 UTC (rev 213673)
@@ -35,6 +35,11 @@
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101000 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101100 = YES;
+TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000_101200 = YES;
+
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -51,6 +56,18 @@
ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_IF_NOT_YES = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphone*] = $(ENABLE_APPLE_PAY_DELEGATE_$(PLATFORM_NAME));
+ENABLE_APPLE_PAY_DELEGATE_iphoneos = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_iphonesimulator = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_DELEGATE[sdk=iphonesimulator10*] = ;
+
+DISABLE_APPLE_PAY_DELEGATE_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_DELEGATE[sdk=macosx*] = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_ = $(ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO);
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_NO = ENABLE_APPLE_PAY_DELEGATE;
+ENABLE_APPLE_PAY_DELEGATE_IF_NOT_YES = ;
+
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -233,4 +250,4 @@
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT
) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM)
$(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_DELEGATE) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_L
OAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATIS
TICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_READABLE_BYTE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(
ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
