Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (217625 => 217626)
--- trunk/Source/_javascript_Core/ChangeLog 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-05-31 21:35:31 UTC (rev 217626)
@@ -1,3 +1,12 @@
+2017-05-31 Andy Estes <[email protected]>
+
+ Rename ENABLE_APPLE_PAY_DELEGATE to ENABLE_APPLE_PAY_SESSION_V3 and bump the supported version number
+ https://bugs.webkit.org/show_bug.cgi?id=172366
+
+ Reviewed by Daniel Bates.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-05-31 Keith Miller <[email protected]>
Reland r216808, underlying lldb bug has been fixed.
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (217625 => 217626)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-05-31 21:35:31 UTC (rev 217626)
@@ -56,17 +56,17 @@
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*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(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[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[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_DELEGATE_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 = ;
+DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
Modified: trunk/Source/WebCore/ChangeLog (217625 => 217626)
--- trunk/Source/WebCore/ChangeLog 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/ChangeLog 2017-05-31 21:35:31 UTC (rev 217626)
@@ -1,3 +1,18 @@
+2017-05-31 Andy Estes <[email protected]>
+
+ Rename ENABLE_APPLE_PAY_DELEGATE to ENABLE_APPLE_PAY_SESSION_V3 and bump the supported version number
+ https://bugs.webkit.org/show_bug.cgi?id=172366
+
+ Reviewed by Daniel Bates.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Modules/applepay/ApplePayError.idl:
+ * Modules/applepay/ApplePayPaymentAuthorizationResult.idl:
+ * Modules/applepay/ApplePayPaymentMethodUpdate.idl:
+ * Modules/applepay/ApplePaySession.idl:
+ * Modules/applepay/ApplePayShippingContactUpdate.idl:
+ * Modules/applepay/ApplePayShippingMethodUpdate.idl:
+
2017-05-31 Youenn Fablet <[email protected]>
PeerConnection should respect tracks that are muted at the time they are added
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (217625 => 217626)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-05-31 21:35:31 UTC (rev 217626)
@@ -56,17 +56,17 @@
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*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(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[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[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_DELEGATE_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 = ;
+DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayError.idl (217625 => 217626)
--- trunk/Source/WebCore/Modules/applepay/ApplePayError.idl 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayError.idl 2017-05-31 21:35:31 UTC (rev 217626)
@@ -24,7 +24,7 @@
*/
[
- Conditional=APPLE_PAY_DELEGATE,
+ Conditional=APPLE_PAY_SESSION_V3,
] enum ApplePayErrorCode {
"unknown",
"shippingContactInvalid",
@@ -33,7 +33,7 @@
};
[
- Conditional=APPLE_PAY_DELEGATE,
+ Conditional=APPLE_PAY_SESSION_V3,
] enum ApplePayErrorContactField {
"phoneNumber",
"emailAddress",
@@ -49,7 +49,7 @@
[
Constructor(ApplePayErrorCode errorCode, optional ApplePayErrorContactField contactField, optional DOMString message = ""),
- Conditional=APPLE_PAY_DELEGATE,
+ Conditional=APPLE_PAY_SESSION_V3,
] interface ApplePayError {
attribute ApplePayErrorCode code;
attribute ApplePayErrorContactField? contactField;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl (217625 => 217626)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizationResult.idl 2017-05-31 21:35:31 UTC (rev 217626)
@@ -24,7 +24,7 @@
*/
[
- Conditional=APPLE_PAY_DELEGATE,
+ Conditional=APPLE_PAY_SESSION_V3,
] dictionary ApplePayPaymentAuthorizationResult {
required unsigned short status;
sequence<ApplePayError> errors;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl (217625 => 217626)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentMethodUpdate.idl 2017-05-31 21:35:31 UTC (rev 217626)
@@ -24,7 +24,7 @@
*/
[
- Conditional=APPLE_PAY_DELEGATE,
+ Conditional=APPLE_PAY_SESSION_V3,
] dictionary ApplePayPaymentMethodUpdate {
required ApplePayLineItem newTotal;
sequence<ApplePayLineItem> newLineItems;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl (217625 => 217626)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2017-05-31 21:35:31 UTC (rev 217626)
@@ -48,10 +48,10 @@
[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, 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(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 (217625 => 217626)
--- trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.idl 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayShippingContactUpdate.idl 2017-05-31 21:35:31 UTC (rev 217626)
@@ -24,7 +24,7 @@
*/
[
- Conditional=APPLE_PAY_DELEGATE,
+ Conditional=APPLE_PAY_SESSION_V3,
] dictionary ApplePayShippingContactUpdate {
sequence<ApplePayError> errors;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl (217625 => 217626)
--- trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayShippingMethodUpdate.idl 2017-05-31 21:35:31 UTC (rev 217626)
@@ -24,7 +24,7 @@
*/
[
- Conditional=APPLE_PAY_DELEGATE,
+ Conditional=APPLE_PAY_SESSION_V3,
] dictionary ApplePayShippingMethodUpdate {
required ApplePayLineItem newTotal;
sequence<ApplePayLineItem> newLineItems;
Modified: trunk/Source/WebCore/PAL/ChangeLog (217625 => 217626)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-05-31 21:35:31 UTC (rev 217626)
@@ -1,3 +1,12 @@
+2017-05-31 Andy Estes <[email protected]>
+
+ Rename ENABLE_APPLE_PAY_DELEGATE to ENABLE_APPLE_PAY_SESSION_V3 and bump the supported version number
+ https://bugs.webkit.org/show_bug.cgi?id=172366
+
+ Reviewed by Daniel Bates.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-05-30 Alex Christensen <[email protected]>
Update libwebrtc configuration
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (217625 => 217626)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-05-31 21:35:31 UTC (rev 217626)
@@ -56,17 +56,17 @@
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*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(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[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[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_DELEGATE_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 = ;
+DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
Modified: trunk/Source/WebKit/mac/ChangeLog (217625 => 217626)
--- trunk/Source/WebKit/mac/ChangeLog 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-05-31 21:35:31 UTC (rev 217626)
@@ -1,3 +1,12 @@
+2017-05-31 Andy Estes <[email protected]>
+
+ Rename ENABLE_APPLE_PAY_DELEGATE to ENABLE_APPLE_PAY_SESSION_V3 and bump the supported version number
+ https://bugs.webkit.org/show_bug.cgi?id=172366
+
+ Reviewed by Daniel Bates.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-05-30 Ryosuke Niwa <[email protected]>
Only include DataDetectorsUI headers in iOS
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (217625 => 217626)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-05-31 21:35:31 UTC (rev 217626)
@@ -56,17 +56,17 @@
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*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(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[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[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_DELEGATE_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 = ;
+DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
Modified: trunk/Source/WebKit2/ChangeLog (217625 => 217626)
--- trunk/Source/WebKit2/ChangeLog 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebKit2/ChangeLog 2017-05-31 21:35:31 UTC (rev 217626)
@@ -1,3 +1,14 @@
+2017-05-31 Andy Estes <[email protected]>
+
+ Rename ENABLE_APPLE_PAY_DELEGATE to ENABLE_APPLE_PAY_SESSION_V3 and bump the supported version number
+ https://bugs.webkit.org/show_bug.cgi?id=172366
+
+ Reviewed by Daniel Bates.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * WebProcess/ApplePay/WebPaymentCoordinator.cpp:
+ (WebKit::WebPaymentCoordinator::supportsVersion):
+
2017-05-31 Chris Dumez <[email protected]>
[WK2] Fix bad assertion in BackgroundProcessResponsivenessTimer::scheduleNextResponsivenessCheck()
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (217625 => 217626)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-05-31 21:35:31 UTC (rev 217626)
@@ -56,17 +56,17 @@
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*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(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[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[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_DELEGATE_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 = ;
+DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
Modified: trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp (217625 => 217626)
--- trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2017-05-31 21:35:31 UTC (rev 217626)
@@ -55,10 +55,13 @@
{
ASSERT(version > 0);
- if (version <= 2)
- return true;
+#if !ENABLE(APPLE_PAY_SESSION_V3)
+ static const unsigned currentVersion = 2;
+#else
+ static const unsigned currentVersion = 3;
+#endif
- return false;
+ return version <= currentVersion;
}
bool WebPaymentCoordinator::canMakePayments()
Modified: trunk/Tools/ChangeLog (217625 => 217626)
--- trunk/Tools/ChangeLog 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Tools/ChangeLog 2017-05-31 21:35:31 UTC (rev 217626)
@@ -1,3 +1,12 @@
+2017-05-31 Andy Estes <[email protected]>
+
+ Rename ENABLE_APPLE_PAY_DELEGATE to ENABLE_APPLE_PAY_SESSION_V3 and bump the supported version number
+ https://bugs.webkit.org/show_bug.cgi?id=172366
+
+ Reviewed by Daniel Bates.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2017-05-31 Jiewen Tan <[email protected]>
Unreviewed, add Jiewen Tan as a reviewer
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (217625 => 217626)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-05-31 20:54:49 UTC (rev 217625)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-05-31 21:35:31 UTC (rev 217626)
@@ -56,17 +56,17 @@
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*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(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[sdk=iphoneos10*] = ;
+ENABLE_APPLE_PAY_SESSION_V3[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_DELEGATE_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 = ;
+DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
+ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
+ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
