[Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 30 May 2020 01:08:40 +0000 (01:08 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 30 May 2020 01:08:40 +0000 (01:08 +0000)
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:

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* 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:

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit:

* Configurations/FeatureDefines.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/FeatureDefines.xcconfig:

Tools:

* Scripts/webkitperl/FeatureList.pm:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

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

34 files changed:
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/Modules/applepay/ApplePayError.idl
Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl
Source/WebCore/Modules/applepay/ApplePayPaymentContact.idl
Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl
Source/WebCore/Modules/applepay/ApplePayRequestBase.idl
Source/WebCore/Modules/applepay/ApplePaySession.idl
Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.idl
Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl
Source/WebCore/Modules/applepay/PaymentCoordinatorClient.cpp
Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/accessibility/AccessibilityRenderObject.cpp
Source/WebCore/css/CSSPrimitiveValueMappings.h
Source/WebCore/css/CSSValueKeywords.in
Source/WebCore/css/parser/CSSParserFastPaths.cpp
Source/WebCore/rendering/RenderThemeCocoa.mm
Source/WebCore/rendering/style/RenderStyleConstants.cpp
Source/WebCore/rendering/style/RenderStyleConstants.h
Source/WebKit/ChangeLog
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Source/cmake/OptionsFTW.cmake
Source/cmake/OptionsMac.cmake
Source/cmake/WebKitFeatures.cmake
Tools/ChangeLog
Tools/Scripts/webkitperl/FeatureList.pm
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index 0b3da05..3e031d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2020-05-29  Andy Estes  <aestes@apple.com>
+
+        [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  <krollin@apple.com>
 
         Revert switch to XCBuild
index 2ec9cf6..b7b5efd 100644 (file)
@@ -1,3 +1,14 @@
+2020-05-29  Andy Estes  <aestes@apple.com>
+
+        [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  <darin@apple.com>
 
         Remove things from FeatureDefines.xcconfig that are covered by PlatformEnableCocoa.h
index 2264e30..16cfd51 100644 (file)
@@ -38,19 +38,6 @@ ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 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_iphoneos = ENABLE_WEB_RTC;
 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_KEYBOARD_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);
index be15a75..7d19e15 100644 (file)
@@ -1,3 +1,39 @@
+2020-05-29  Andy Estes  <aestes@apple.com>
+
+        [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  <jer.noble@apple.com>
 
         [EME] navigator.requestMediaKeySystemAccess() should reject PUR sessionTypes in private browsing mode.
index 2264e30..16cfd51 100644 (file)
@@ -38,19 +38,6 @@ ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 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_iphoneos = ENABLE_WEB_RTC;
 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_KEYBOARD_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);
index f4a9f64..480bf33 100644 (file)
@@ -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;
index 29972e2..ec6d3e2 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=APPLE_PAY_SESSION_V3,
+    Conditional=APPLE_PAY,
 ] dictionary ApplePayPaymentAuthorizationResult {
     required unsigned short status;
     sequence<ApplePayError> errors;
index 9d5e62f..570148b 100644 (file)
@@ -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;
index 4f2f1f1..c06910d 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=APPLE_PAY_SESSION_V3,
+    Conditional=APPLE_PAY,
 ] dictionary ApplePayPaymentMethodUpdate {
     required ApplePayLineItem newTotal;
     sequence<ApplePayLineItem> newLineItems;
index e57d00d..e715252 100644 (file)
@@ -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;
 };
index dc02a92..5ce0150 100644 (file)
     [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);
index 3d519a1..052e82b 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=APPLE_PAY_SESSION_V3,
+    Conditional=APPLE_PAY,
 ] dictionary ApplePayShippingContactUpdate {
     sequence<ApplePayError> errors;
 
index 3d6f7d6..8459da8 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=APPLE_PAY_SESSION_V3,
+    Conditional=APPLE_PAY,
 ] dictionary ApplePayShippingMethodUpdate {
     required ApplePayLineItem newTotal;
     sequence<ApplePayLineItem> newLineItems;
index 681a7d0..425f443 100644 (file)
@@ -34,11 +34,7 @@ bool PaymentCoordinatorClient::supportsVersion(unsigned version)
 {
     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;
index bec7d3b..50bbc78 100644 (file)
@@ -401,7 +401,6 @@ ExceptionOr<void> ApplePayPaymentHandler::computePaymentMethodErrors(JSC::JSObje
     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 @@ ExceptionOr<void> ApplePayPaymentHandler::computePaymentMethodErrors(JSC::JSObje
         if (applePayError)
             errors.append({ applePayError->code(), applePayError->message(), applePayError->contactField() });
     }
-#else
-    UNUSED_PARAM(errors);
-#endif
 
     return { };
 }
index e4a39aa..17c35c8 100644 (file)
@@ -1,3 +1,14 @@
+2020-05-29  Andy Estes  <aestes@apple.com>
+
+        [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  <darin@apple.com>
 
         Remove things from FeatureDefines.xcconfig that are covered by PlatformEnableCocoa.h
index 2264e30..16cfd51 100644 (file)
@@ -38,19 +38,6 @@ ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 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_iphoneos = ENABLE_WEB_RTC;
 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_KEYBOARD_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);
index e35fabf..dc3eba1 100644 (file)
@@ -1130,14 +1130,12 @@ String AccessibilityRenderObject::applePayButtonDescription() const
         return AXApplePaySetupLabel();
     case ApplePayButtonType::Donate:
         return AXApplePayDonateLabel();
-#if ENABLE(APPLE_PAY_SESSION_V4)
     case ApplePayButtonType::CheckOut:
         return AXApplePayCheckOutLabel();
     case ApplePayButtonType::Book:
         return AXApplePayBookLabel();
     case ApplePayButtonType::Subscribe:
         return AXApplePaySubscribeLabel();
-#endif
     }
 }
 #endif
index 1cd1084..f97de55 100644 (file)
@@ -5465,7 +5465,6 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ApplePayButtonType e)
     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 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ApplePayButtonType e)
     case ApplePayButtonType::Subscribe:
         m_value.valueID = CSSValueSubscribe;
         break;
-#endif
-
     default:
         ASSERT_NOT_REACHED();
         break;
@@ -5495,14 +5492,12 @@ template<> inline CSSPrimitiveValue::operator ApplePayButtonType() const
         return ApplePayButtonType::SetUp;
     case CSSValueDonate:
         return ApplePayButtonType::Donate;
-#if ENABLE(APPLE_PAY_SESSION_V4)
     case CSSValueCheckOut:
         return ApplePayButtonType::CheckOut;
     case CSSValueBook:
         return ApplePayButtonType::Book;
     case CSSValueSubscribe:
         return ApplePayButtonType::Subscribe;
-#endif
     default:
         break;
     }
index 6f67bcc..31feec7 100644 (file)
@@ -1351,12 +1351,10 @@ plain
 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
index 0c2d24b..365b06b 100644 (file)
@@ -835,15 +835,8 @@ bool CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyID propertyId
 #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;
-#endif
+    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
     case CSSPropertyWebkitNbspMode: // normal | space
         return valueID == CSSValueNormal || valueID == CSSValueSpace;
index 519f0ec..4820236 100644 (file)
@@ -91,14 +91,12 @@ static PKPaymentButtonType toPKPaymentButtonType(ApplePayButtonType type)
         return PKPaymentButtonTypeSetUp;
     case ApplePayButtonType::Donate:
         return PKPaymentButtonTypeDonate;
-#if ENABLE(APPLE_PAY_SESSION_V4)
     case ApplePayButtonType::CheckOut:
         return PKPaymentButtonTypeCheckout;
     case ApplePayButtonType::Book:
         return PKPaymentButtonTypeBook;
     case ApplePayButtonType::Subscribe:
         return PKPaymentButtonTypeSubscribe;
-#endif
     }
 }
 
index b13cbb3..ea496f0 100644 (file)
@@ -69,12 +69,9 @@ TextStream& operator<<(TextStream& ts, ApplePayButtonType playState)
     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;
 }
index 5dab80c..d961721 100644 (file)
@@ -1147,11 +1147,9 @@ enum class ApplePayButtonType : uint8_t {
     Buy,
     SetUp,
     Donate,
-#if ENABLE(APPLE_PAY_SESSION_V4)
     CheckOut,
     Book,
     Subscribe,
-#endif
 };
 #endif
 
index 25fa035..0aa6ce1 100644 (file)
@@ -1,3 +1,14 @@
+2020-05-29  Andy Estes  <aestes@apple.com>
+
+        [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  <dino@apple.com>
 
         iOS build fix.
index 2264e30..16cfd51 100644 (file)
@@ -38,19 +38,6 @@ ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 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_iphoneos = ENABLE_WEB_RTC;
 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_KEYBOARD_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);
index b5d0396..5c2094a 100644 (file)
@@ -1,3 +1,14 @@
+2020-05-29  Andy Estes  <aestes@apple.com>
+
+        [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  <ddkilzer@apple.com>
 
         REGRESSION (r260306): Compatibility issue leading to crash on macOS games
index 2264e30..16cfd51 100644 (file)
@@ -38,19 +38,6 @@ ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 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_iphoneos = ENABLE_WEB_RTC;
 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_KEYBOARD_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);
index cef1174..16d1de4 100644 (file)
@@ -129,8 +129,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE OFF)
 
 # 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
index 8ab1674..5a765d4 100644 (file)
@@ -20,8 +20,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
 
 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)
index 7f624f3..67a3d4b 100644 (file)
@@ -101,8 +101,6 @@ macro(WEBKIT_OPTION_BEGIN)
     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 @@ macro(WEBKIT_OPTION_BEGIN)
     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)
index f119e3b..686ebd8 100644 (file)
@@ -1,3 +1,15 @@
+2020-05-29  Andy Estes  <aestes@apple.com>
+
+        [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  <jan.brummer@tabos.org>
 
         [GTK][WPE] API for WebView audio mute support
index f730519..7771644 100644 (file)
@@ -208,12 +208,6 @@ my @features = (
     { 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 },
 
index 2264e30..16cfd51 100644 (file)
@@ -38,19 +38,6 @@ ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 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_iphoneos = ENABLE_WEB_RTC;
 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_KEYBOARD_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);