Title: [291378] trunk/Source/WebCore
- Revision
- 291378
- Author
- drou...@apple.com
- Date
- 2022-03-16 17:23:18 -0700 (Wed, 16 Mar 2022)
Log Message
[Apple Pay] version values are incorrect, causing incorrect feature detection
https://bugs.webkit.org/show_bug.cgi?id=237989
<rdar://problem/90399356>
Reviewed by Tim Horton.
Version 13 should also be enabled for `ENABLE_APPLE_PAY_SELECTED_SHIPPING_METHOD`, and
`ENABLE_APPLE_PAY_PAYMENT_DETAILS_DATA` really corresponds to Version 14.
* Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm:
(WebCore::PaymentAPIVersion::current):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (291377 => 291378)
--- trunk/Source/WebCore/ChangeLog 2022-03-17 00:05:30 UTC (rev 291377)
+++ trunk/Source/WebCore/ChangeLog 2022-03-17 00:23:18 UTC (rev 291378)
@@ -1,3 +1,17 @@
+2022-03-16 Devin Rousso <drou...@apple.com>
+
+ [Apple Pay] version values are incorrect, causing incorrect feature detection
+ https://bugs.webkit.org/show_bug.cgi?id=237989
+ <rdar://problem/90399356>
+
+ Reviewed by Tim Horton.
+
+ Version 13 should also be enabled for `ENABLE_APPLE_PAY_SELECTED_SHIPPING_METHOD`, and
+ `ENABLE_APPLE_PAY_PAYMENT_DETAILS_DATA` really corresponds to Version 14.
+
+ * Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm:
+ (WebCore::PaymentAPIVersion::current):
+
2022-03-16 Eric Carlson <eric.carl...@apple.com>
[Cocoa] Minor AVVideoCaptureSource cleanup
Modified: trunk/Source/WebCore/Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm (291377 => 291378)
--- trunk/Source/WebCore/Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm 2022-03-17 00:05:30 UTC (rev 291377)
+++ trunk/Source/WebCore/Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm 2022-03-17 00:23:18 UTC (rev 291378)
@@ -35,9 +35,9 @@
unsigned PaymentAPIVersion::current()
{
static unsigned current = [] {
-#if ENABLE(APPLE_PAY_PAYMENT_COMPLETE_DETAILS_DATA)
+#if ENABLE(APPLE_PAY_PAYMENT_DETAILS_DATA) || ENABLE(APPLE_PAY_PAYMENT_COMPLETE_DETAILS_DATA)
return 14;
-#elif ENABLE(APPLE_PAY_PAYMENT_DETAILS_DATA) || ENABLE(APPLE_PAY_AMS_UI)
+#elif ENABLE(APPLE_PAY_SELECTED_SHIPPING_METHOD) || ENABLE(APPLE_PAY_AMS_UI)
return 13;
#elif ENABLE(APPLE_PAY_COUPON_CODE) || ENABLE(APPLE_PAY_SHIPPING_CONTACT_EDITING_MODE) || ENABLE(APPLE_PAY_RECURRING_LINE_ITEM) || ENABLE(APPLE_PAY_DEFERRED_LINE_ITEM) || ENABLE(APPLE_PAY_SHIPPING_METHOD_DATE_COMPONENTS_RANGE)
return 12;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
