Title: [291451] trunk/Source/WebCore
- Revision
- 291451
- Author
- drou...@apple.com
- Date
- 2022-03-17 17:08:27 -0700 (Thu, 17 Mar 2022)
Log Message
[Apple Pay] REGRESSION(r283431): `HAVE_PASSKIT_PAYMENT_METHOD_BILLING_ADDRESS` was removed without also removing where it was used
https://bugs.webkit.org/show_bug.cgi?id=238056
<rdar://problem/89940620>
Reviewed by Tim Horton.
* Modules/applepay/cocoa/PaymentMethodCocoa.mm:
(WebCore::convert):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (291450 => 291451)
--- trunk/Source/WebCore/ChangeLog 2022-03-17 23:48:44 UTC (rev 291450)
+++ trunk/Source/WebCore/ChangeLog 2022-03-18 00:08:27 UTC (rev 291451)
@@ -1,3 +1,14 @@
+2022-03-17 Devin Rousso <drou...@apple.com>
+
+ [Apple Pay] REGRESSION(r283431): `HAVE_PASSKIT_PAYMENT_METHOD_BILLING_ADDRESS` was removed without also removing where it was used
+ https://bugs.webkit.org/show_bug.cgi?id=238056
+ <rdar://problem/89940620>
+
+ Reviewed by Tim Horton.
+
+ * Modules/applepay/cocoa/PaymentMethodCocoa.mm:
+ (WebCore::convert):
+
2022-03-17 Chris Dumez <cdu...@apple.com>
Microsoft Teams fails to launch from Safari
Modified: trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm (291450 => 291451)
--- trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm 2022-03-17 23:48:44 UTC (rev 291450)
+++ trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm 2022-03-18 00:08:27 UTC (rev 291451)
@@ -98,7 +98,6 @@
}
}
-#if HAVE(PASSKIT_PAYMENT_METHOD_BILLING_ADDRESS)
static void convert(CNLabeledValue<CNPostalAddress*> *postalAddress, ApplePayPaymentContact &result)
{
if (NSString *street = postalAddress.value.street)
@@ -136,7 +135,6 @@
return result;
}
-#endif
static ApplePayPaymentMethod convert(PKPaymentMethod *paymentMethod)
{
@@ -146,9 +144,7 @@
result.displayName = displayName;
if (NSString *network = paymentMethod.network)
result.network = network;
-#if HAVE(PASSKIT_PAYMENT_METHOD_BILLING_ADDRESS)
result.billingContact = convert(paymentMethod.billingAddress);
-#endif
result.type = convert(paymentMethod.type);
result.paymentPass = convert(paymentMethod.paymentPass);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
