Diff
Modified: trunk/ChangeLog (262330 => 262331)
--- trunk/ChangeLog 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/ChangeLog 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1,3 +1,16 @@
+2020-05-29 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
+ https://bugs.webkit.org/show_bug.cgi?id=212541
+
+ Reviewed by Darin Adler.
+
+ APPLE_PAY_SESSION_V(3|4) is now enabled whenever APPLE_PAY itself is enabled.
+
+ * Source/cmake/OptionsFTW.cmake:
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2020-05-29 Keith Rollin <[email protected]>
Revert switch to XCBuild
Modified: trunk/Source/_javascript_Core/ChangeLog (262330 => 262331)
--- trunk/Source/_javascript_Core/ChangeLog 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1,3 +1,14 @@
+2020-05-29 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
+ https://bugs.webkit.org/show_bug.cgi?id=212541
+
+ Reviewed by Darin Adler.
+
+ APPLE_PAY_SESSION_V(3|4) is now enabled whenever APPLE_PAY itself is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2020-05-29 Darin Adler <[email protected]>
Remove things from FeatureDefines.xcconfig that are covered by PlatformEnableCocoa.h
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (262330 => 262331)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2020-05-30 01:08:40 UTC (rev 262331)
@@ -38,19 +38,6 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_macosx = ENABLE_APPLE_PAY_SESSION_V3;
-
-ENABLE_APPLE_PAY_SESSION_V4 = $(ENABLE_APPLE_PAY_SESSION_V4_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_macosx = $(ENABLE_APPLE_PAY_SESSION_V4$(WK_MACOS_1014));
-ENABLE_APPLE_PAY_SESSION_V4_MACOS_SINCE_1014 = ENABLE_APPLE_PAY_SESSION_V4;
-
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -249,4 +236,4 @@
ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC;
-FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOAR
D_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE
_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
Modified: trunk/Source/WebCore/ChangeLog (262330 => 262331)
--- trunk/Source/WebCore/ChangeLog 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/ChangeLog 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1,3 +1,39 @@
+2020-05-29 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
+ https://bugs.webkit.org/show_bug.cgi?id=212541
+
+ Reviewed by Darin Adler.
+
+ APPLE_PAY_SESSION_V(3|4) is now enabled whenever APPLE_PAY itself is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Modules/applepay/ApplePayError.idl:
+ * Modules/applepay/ApplePayPaymentAuthorizationResult.idl:
+ * Modules/applepay/ApplePayPaymentContact.idl:
+ * Modules/applepay/ApplePayPaymentMethodUpdate.idl:
+ * Modules/applepay/ApplePayRequestBase.idl:
+ * Modules/applepay/ApplePaySession.idl:
+ * Modules/applepay/ApplePayShippingContactUpdate.idl:
+ * Modules/applepay/ApplePayShippingMethodUpdate.idl:
+ * Modules/applepay/PaymentCoordinatorClient.cpp:
+ (WebCore::PaymentCoordinatorClient::supportsVersion):
+ * Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
+ (WebCore::ApplePayPaymentHandler::computePaymentMethodErrors const):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::applePayButtonDescription const):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator ApplePayButtonType const):
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ * rendering/RenderThemeCocoa.mm:
+ (WebCore::toPKPaymentButtonType):
+ * rendering/style/RenderStyleConstants.cpp:
+ (WebCore::operator<<):
+ * rendering/style/RenderStyleConstants.h:
+
2020-05-29 Jer Noble <[email protected]>
[EME] navigator.requestMediaKeySystemAccess() should reject PUR sessionTypes in private browsing mode.
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (262330 => 262331)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2020-05-30 01:08:40 UTC (rev 262331)
@@ -38,19 +38,6 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_macosx = ENABLE_APPLE_PAY_SESSION_V3;
-
-ENABLE_APPLE_PAY_SESSION_V4 = $(ENABLE_APPLE_PAY_SESSION_V4_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_macosx = $(ENABLE_APPLE_PAY_SESSION_V4$(WK_MACOS_1014));
-ENABLE_APPLE_PAY_SESSION_V4_MACOS_SINCE_1014 = ENABLE_APPLE_PAY_SESSION_V4;
-
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -249,4 +236,4 @@
ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC;
-FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOAR
D_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE
_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayError.idl (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/ApplePayError.idl 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayError.idl 2020-05-30 01:08:40 UTC (rev 262331)
@@ -25,7 +25,7 @@
[
Constructor(ApplePayErrorCode errorCode, optional ApplePayErrorContactField contactField, optional DOMString message = ""),
- Conditional=APPLE_PAY_SESSION_V3,
+ Conditional=APPLE_PAY,
] interface ApplePayError {
attribute ApplePayErrorCode code;
attribute ApplePayErrorContactField? contactField;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl 2020-05-30 01:08:40 UTC (rev 262331)
@@ -24,7 +24,7 @@
*/
[
- Conditional=APPLE_PAY_SESSION_V3,
+ Conditional=APPLE_PAY,
] dictionary ApplePayPaymentAuthorizationResult {
required unsigned short status;
sequence<ApplePayError> errors;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.idl (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.idl 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.idl 2020-05-30 01:08:40 UTC (rev 262331)
@@ -31,8 +31,8 @@
DOMString emailAddress;
DOMString givenName;
DOMString familyName;
- [Conditional=APPLE_PAY_SESSION_V3] DOMString phoneticGivenName;
- [Conditional=APPLE_PAY_SESSION_V3] DOMString phoneticFamilyName;
+ DOMString phoneticGivenName;
+ DOMString phoneticFamilyName;
sequence<DOMString> addressLines;
DOMString subLocality;
DOMString locality;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl 2020-05-30 01:08:40 UTC (rev 262331)
@@ -24,7 +24,7 @@
*/
[
- Conditional=APPLE_PAY_SESSION_V3,
+ Conditional=APPLE_PAY,
] dictionary ApplePayPaymentMethodUpdate {
required ApplePayLineItem newTotal;
sequence<ApplePayLineItem> newLineItems;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayRequestBase.idl (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/ApplePayRequestBase.idl 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayRequestBase.idl 2020-05-30 01:08:40 UTC (rev 262331)
@@ -37,7 +37,7 @@
ApplePayPaymentContact shippingContact;
DOMString applicationData;
- [Conditional=APPLE_PAY_SESSION_V3] sequence<DOMString> supportedCountries;
+ sequence<DOMString> supportedCountries;
[Conditional=APPLE_PAY_INSTALLMENTS] ApplePayInstallmentConfiguration installmentConfiguration;
};
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2020-05-30 01:08:40 UTC (rev 262331)
@@ -49,10 +49,10 @@
[CallWith=Document, MayThrowException] void begin();
[MayThrowException] void abort();
[MayThrowException, CallWith=GlobalObject] void completeMerchantValidation(any merchantSession);
- [MayThrowException, Conditional=APPLE_PAY_SESSION_V3] void completeShippingMethodSelection(ApplePayShippingMethodUpdate update);
- [MayThrowException, Conditional=APPLE_PAY_SESSION_V3] void completeShippingContactSelection(ApplePayShippingContactUpdate update);
- [MayThrowException, Conditional=APPLE_PAY_SESSION_V3] void completePaymentMethodSelection(ApplePayPaymentMethodUpdate update);
- [MayThrowException, Conditional=APPLE_PAY_SESSION_V3] void completePayment(ApplePayPaymentAuthorizationResult result);
+ [MayThrowException] void completeShippingMethodSelection(ApplePayShippingMethodUpdate update);
+ [MayThrowException] void completeShippingContactSelection(ApplePayShippingContactUpdate update);
+ [MayThrowException] void completePaymentMethodSelection(ApplePayPaymentMethodUpdate update);
+ [MayThrowException] 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);
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.idl (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.idl 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.idl 2020-05-30 01:08:40 UTC (rev 262331)
@@ -24,7 +24,7 @@
*/
[
- Conditional=APPLE_PAY_SESSION_V3,
+ Conditional=APPLE_PAY,
] dictionary ApplePayShippingContactUpdate {
sequence<ApplePayError> errors;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl 2020-05-30 01:08:40 UTC (rev 262331)
@@ -24,7 +24,7 @@
*/
[
- Conditional=APPLE_PAY_SESSION_V3,
+ Conditional=APPLE_PAY,
] dictionary ApplePayShippingMethodUpdate {
required ApplePayLineItem newTotal;
sequence<ApplePayLineItem> newLineItems;
Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.cpp (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.cpp 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.cpp 2020-05-30 01:08:40 UTC (rev 262331)
@@ -34,11 +34,7 @@
{
ASSERT(version > 0);
-#if !ENABLE(APPLE_PAY_SESSION_V3)
- static const unsigned currentVersion = 2;
-#elif !ENABLE(APPLE_PAY_SESSION_V4)
- static const unsigned currentVersion = 3;
-#elif !ENABLE(APPLE_PAY_SESSION_V7)
+#if !ENABLE(APPLE_PAY_SESSION_V7)
static const unsigned currentVersion = 6;
#elif !ENABLE(APPLE_PAY_SESSION_V8)
static const unsigned currentVersion = 7;
Modified: trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp (262330 => 262331)
--- trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp 2020-05-30 01:08:40 UTC (rev 262331)
@@ -401,7 +401,6 @@
if (!paymentMethodErrors)
return { };
-#if ENABLE(APPLE_PAY_SESSION_V3)
auto& context = *scriptExecutionContext();
auto throwScope = DECLARE_THROW_SCOPE(context.vm());
auto applePayErrors = convert<IDLSequence<IDLInterface<ApplePayError>>>(*context.execState(), paymentMethodErrors);
@@ -412,9 +411,6 @@
if (applePayError)
errors.append({ applePayError->code(), applePayError->message(), applePayError->contactField() });
}
-#else
- UNUSED_PARAM(errors);
-#endif
return { };
}
Modified: trunk/Source/WebCore/PAL/ChangeLog (262330 => 262331)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1,3 +1,14 @@
+2020-05-29 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
+ https://bugs.webkit.org/show_bug.cgi?id=212541
+
+ Reviewed by Darin Adler.
+
+ APPLE_PAY_SESSION_V(3|4) is now enabled whenever APPLE_PAY itself is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+
S2020-05-29 Darin Adler <[email protected]>
Remove things from FeatureDefines.xcconfig that are covered by PlatformEnableCocoa.h
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (262330 => 262331)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2020-05-30 01:08:40 UTC (rev 262331)
@@ -38,19 +38,6 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_macosx = ENABLE_APPLE_PAY_SESSION_V3;
-
-ENABLE_APPLE_PAY_SESSION_V4 = $(ENABLE_APPLE_PAY_SESSION_V4_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_macosx = $(ENABLE_APPLE_PAY_SESSION_V4$(WK_MACOS_1014));
-ENABLE_APPLE_PAY_SESSION_V4_MACOS_SINCE_1014 = ENABLE_APPLE_PAY_SESSION_V4;
-
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -249,4 +236,4 @@
ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC;
-FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOAR
D_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE
_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (262330 => 262331)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1130,7 +1130,6 @@
return AXApplePaySetupLabel();
case ApplePayButtonType::Donate:
return AXApplePayDonateLabel();
-#if ENABLE(APPLE_PAY_SESSION_V4)
case ApplePayButtonType::CheckOut:
return AXApplePayCheckOutLabel();
case ApplePayButtonType::Book:
@@ -1137,7 +1136,6 @@
return AXApplePayBookLabel();
case ApplePayButtonType::Subscribe:
return AXApplePaySubscribeLabel();
-#endif
}
}
#endif
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (262330 => 262331)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2020-05-30 01:08:40 UTC (rev 262331)
@@ -5465,7 +5465,6 @@
case ApplePayButtonType::Donate:
m_value.valueID = CSSValueDonate;
break;
-#if ENABLE(APPLE_PAY_SESSION_V4)
case ApplePayButtonType::CheckOut:
m_value.valueID = CSSValueCheckOut;
break;
@@ -5475,8 +5474,6 @@
case ApplePayButtonType::Subscribe:
m_value.valueID = CSSValueSubscribe;
break;
-#endif
-
default:
ASSERT_NOT_REACHED();
break;
@@ -5495,7 +5492,6 @@
return ApplePayButtonType::SetUp;
case CSSValueDonate:
return ApplePayButtonType::Donate;
-#if ENABLE(APPLE_PAY_SESSION_V4)
case CSSValueCheckOut:
return ApplePayButtonType::CheckOut;
case CSSValueBook:
@@ -5502,7 +5498,6 @@
return ApplePayButtonType::Book;
case CSSValueSubscribe:
return ApplePayButtonType::Subscribe;
-#endif
default:
break;
}
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (262330 => 262331)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1351,12 +1351,10 @@
buy
set-up
donate
-#if defined(ENABLE_APPLE_PAY_SESSION_V4) && ENABLE_APPLE_PAY_SESSION_V4
check-out
book
subscribe
#endif
-#endif
// font-synthesis
weight
Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (262330 => 262331)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2020-05-30 01:08:40 UTC (rev 262331)
@@ -835,16 +835,9 @@
#if ENABLE(APPLE_PAY)
case CSSPropertyApplePayButtonStyle: // white | white-outline | black
return valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack;
- case CSSPropertyApplePayButtonType: // plain | buy | set-up | donate
- if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueDonate)
- return true;
-#if ENABLE(APPLE_PAY_SESSION_V4)
- // check-out | book | subscribe
- return valueID == CSSValueCheckOut || valueID == CSSValueBook || valueID == CSSValueSubscribe;
-#else
- return false;
+ case CSSPropertyApplePayButtonType: // plain | buy | set-up | donate | check-out | book | subscribe
+ return valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueDonate || valueID == CSSValueCheckOut || valueID == CSSValueBook || valueID == CSSValueSubscribe;
#endif
-#endif
case CSSPropertyWebkitNbspMode: // normal | space
return valueID == CSSValueNormal || valueID == CSSValueSpace;
case CSSPropertyWebkitTextZoom:
Modified: trunk/Source/WebCore/rendering/RenderThemeCocoa.mm (262330 => 262331)
--- trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2020-05-30 01:08:40 UTC (rev 262331)
@@ -91,7 +91,6 @@
return PKPaymentButtonTypeSetUp;
case ApplePayButtonType::Donate:
return PKPaymentButtonTypeDonate;
-#if ENABLE(APPLE_PAY_SESSION_V4)
case ApplePayButtonType::CheckOut:
return PKPaymentButtonTypeCheckout;
case ApplePayButtonType::Book:
@@ -98,7 +97,6 @@
return PKPaymentButtonTypeBook;
case ApplePayButtonType::Subscribe:
return PKPaymentButtonTypeSubscribe;
-#endif
}
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp (262330 => 262331)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp 2020-05-30 01:08:40 UTC (rev 262331)
@@ -69,12 +69,9 @@
case ApplePayButtonType::Buy: ts << "buy"; break;
case ApplePayButtonType::SetUp: ts << "setup"; break;
case ApplePayButtonType::Donate: ts << "donate"; break;
-#if ENABLE(APPLE_PAY_SESSION_V4)
case ApplePayButtonType::CheckOut: ts << "checkout"; break;
case ApplePayButtonType::Book: ts << "book"; break;
case ApplePayButtonType::Subscribe: ts << "subscribe"; break;
-#endif
-
}
return ts;
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (262330 => 262331)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1147,11 +1147,9 @@
Buy,
SetUp,
Donate,
-#if ENABLE(APPLE_PAY_SESSION_V4)
CheckOut,
Book,
Subscribe,
-#endif
};
#endif
Modified: trunk/Source/WebKit/ChangeLog (262330 => 262331)
--- trunk/Source/WebKit/ChangeLog 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebKit/ChangeLog 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1,3 +1,14 @@
+2020-05-29 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
+ https://bugs.webkit.org/show_bug.cgi?id=212541
+
+ Reviewed by Darin Adler.
+
+ APPLE_PAY_SESSION_V(3|4) is now enabled whenever APPLE_PAY itself is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2020-05-29 Dean Jackson <[email protected]>
iOS build fix.
Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (262330 => 262331)
--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2020-05-30 01:08:40 UTC (rev 262331)
@@ -38,19 +38,6 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_macosx = ENABLE_APPLE_PAY_SESSION_V3;
-
-ENABLE_APPLE_PAY_SESSION_V4 = $(ENABLE_APPLE_PAY_SESSION_V4_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_macosx = $(ENABLE_APPLE_PAY_SESSION_V4$(WK_MACOS_1014));
-ENABLE_APPLE_PAY_SESSION_V4_MACOS_SINCE_1014 = ENABLE_APPLE_PAY_SESSION_V4;
-
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -249,4 +236,4 @@
ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC;
-FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOAR
D_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE
_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (262330 => 262331)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1,3 +1,14 @@
+2020-05-29 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
+ https://bugs.webkit.org/show_bug.cgi?id=212541
+
+ Reviewed by Darin Adler.
+
+ APPLE_PAY_SESSION_V(3|4) is now enabled whenever APPLE_PAY itself is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2020-05-29 David Kilzer <[email protected]>
REGRESSION (r260306): Compatibility issue leading to crash on macOS games
Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (262330 => 262331)
--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2020-05-30 01:08:40 UTC (rev 262331)
@@ -38,19 +38,6 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_macosx = ENABLE_APPLE_PAY_SESSION_V3;
-
-ENABLE_APPLE_PAY_SESSION_V4 = $(ENABLE_APPLE_PAY_SESSION_V4_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_macosx = $(ENABLE_APPLE_PAY_SESSION_V4$(WK_MACOS_1014));
-ENABLE_APPLE_PAY_SESSION_V4_MACOS_SINCE_1014 = ENABLE_APPLE_PAY_SESSION_V4;
-
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -249,4 +236,4 @@
ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC;
-FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOAR
D_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE
_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
Modified: trunk/Source/cmake/OptionsFTW.cmake (262330 => 262331)
--- trunk/Source/cmake/OptionsFTW.cmake 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/cmake/OptionsFTW.cmake 2020-05-30 01:08:40 UTC (rev 262331)
@@ -129,8 +129,6 @@
# Payment things
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V3 PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V4 PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAYMENT_REQUEST PRIVATE OFF)
# WebGL
Modified: trunk/Source/cmake/OptionsMac.cmake (262330 => 262331)
--- trunk/Source/cmake/OptionsMac.cmake 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/cmake/OptionsMac.cmake 2020-05-30 01:08:40 UTC (rev 262331)
@@ -20,8 +20,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V3 PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V4 PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (262330 => 262331)
--- trunk/Source/cmake/WebKitFeatures.cmake 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2020-05-30 01:08:40 UTC (rev 262331)
@@ -101,8 +101,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY_ISOLATED_TREE "Toggle accessibility isolated tree support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_APPLE_PAY "Toggle Apply Pay support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_APPLE_PAY_SESSION_V3 "Toggle Apple Pay Session V3 support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_APPLE_PAY_SESSION_V4 "Toggle Apple Pay Session V4 support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_APPLE_PAY_SESSION_V9 "Toggle Apple Pay Session V9 support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_APPLICATION_MANIFEST "Toggle Application Manifest support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_ASYNC_SCROLLING "Enable asynchronous scrolling" PRIVATE OFF)
@@ -246,8 +244,6 @@
WEBKIT_OPTION_CONFLICT(ENABLE_SAMPLING_PROFILER ENABLE_C_LOOP)
WEBKIT_OPTION_DEPEND(ENABLE_ACCESSIBILITY_ISOLATED_TREE ENABLE_ACCESSIBILITY)
- WEBKIT_OPTION_DEPEND(ENABLE_APPLE_PAY_SESSION_V3 ENABLE_APPLE_PAY)
- WEBKIT_OPTION_DEPEND(ENABLE_APPLE_PAY_SESSION_V4 ENABLE_APPLE_PAY)
WEBKIT_OPTION_DEPEND(ENABLE_APPLE_PAY_SESSION_V9 ENABLE_APPLE_PAY)
WEBKIT_OPTION_DEPEND(ENABLE_CSS_PAINTING_API ENABLE_CSS_TYPED_OM)
WEBKIT_OPTION_DEPEND(ENABLE_WEB_RTC ENABLE_MEDIA_STREAM)
Modified: trunk/Tools/ChangeLog (262330 => 262331)
--- trunk/Tools/ChangeLog 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Tools/ChangeLog 2020-05-30 01:08:40 UTC (rev 262331)
@@ -1,3 +1,15 @@
+2020-05-29 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
+ https://bugs.webkit.org/show_bug.cgi?id=212541
+
+ Reviewed by Darin Adler.
+
+ APPLE_PAY_SESSION_V(3|4) is now enabled whenever APPLE_PAY itself is enabled.
+
+ * Scripts/webkitperl/FeatureList.pm:
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2020-05-29 Jan-Michael Brummer <[email protected]>
[GTK][WPE] API for WebView audio mute support
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (262330 => 262331)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2020-05-30 01:08:40 UTC (rev 262331)
@@ -208,12 +208,6 @@
{ option => "apple-pay", desc => "Toggle Apply Pay support",
define => "ENABLE_APPLE_PAY", value => \$applePaySupport },
- { option => "apple-pay-session-v3", desc => "Toggle Apple Pay Session V3 support",
- define => "ENABLE_APPLE_PAY_SESSION_V3", value => \$applePaySessionV3Support },
-
- { option => "apple-pay-session-v4", desc => "Toggle Apple Pay Session V4 support",
- define => "ENABLE_APPLE_PAY_SESSION_V4", value => \$applePaySessionV4Support },
-
{ option => "apple-pay-session-v9", desc => "Toggle Apple Pay Session V9 support",
define => "ENABLE_APPLE_PAY_SESSION_V9", value => \$applePaySessionV9Support },
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (262330 => 262331)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2020-05-30 00:42:44 UTC (rev 262330)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2020-05-30 01:08:40 UTC (rev 262331)
@@ -38,19 +38,6 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V3;
-ENABLE_APPLE_PAY_SESSION_V3_macosx = ENABLE_APPLE_PAY_SESSION_V3;
-
-ENABLE_APPLE_PAY_SESSION_V4 = $(ENABLE_APPLE_PAY_SESSION_V4_$(WK_PLATFORM_NAME));
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphoneos[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator = ENABLE_APPLE_PAY_SESSION_V4;
-ENABLE_APPLE_PAY_SESSION_V4_iphonesimulator[sdk=iphone*11.*] = ;
-ENABLE_APPLE_PAY_SESSION_V4_macosx = $(ENABLE_APPLE_PAY_SESSION_V4$(WK_MACOS_1014));
-ENABLE_APPLE_PAY_SESSION_V4_MACOS_SINCE_1014 = ENABLE_APPLE_PAY_SESSION_V4;
-
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
@@ -249,4 +236,4 @@
ENABLE_WEB_RTC_iphonesimulator = ENABLE_WEB_RTC;
ENABLE_WEB_RTC_macosx = ENABLE_WEB_RTC;
-FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOAR
D_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
+FEATURE_DEFINES = $(ENABLE_APPLE_PAY) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_STREAM) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_TOUCH_EVENTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE
_WEBGPU) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC);
