Title: [291672] branches/safari-613-branch/Source/WebCore
- Revision
- 291672
- Author
- alanc...@apple.com
- Date
- 2022-03-22 10:57:12 -0700 (Tue, 22 Mar 2022)
Log Message
Cherry-pick r291451. rdar://problem/89940620
[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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (291671 => 291672)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-22 17:57:08 UTC (rev 291671)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-22 17:57:12 UTC (rev 291672)
@@ -1,5 +1,32 @@
2022-03-21 Alan Coon <alanc...@apple.com>
+ Cherry-pick r291451. rdar://problem/89940620
+
+ [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):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-21 Alan Coon <alanc...@apple.com>
+
Cherry-pick r291330. rdar://problem/90320701
REGRESSION (r282737): `text-shadow` is clipped
Modified: branches/safari-613-branch/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm (291671 => 291672)
--- branches/safari-613-branch/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm 2022-03-22 17:57:08 UTC (rev 291671)
+++ branches/safari-613-branch/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm 2022-03-22 17:57:12 UTC (rev 291672)
@@ -98,7 +98,6 @@
}
}
-#if HAVE(PASSKIT_PAYMENT_METHOD_BILLING_ADDRESS)
static void convert(CNLabeledValue<CNPostalAddress*> *postalAddress, ApplePayPaymentContact &result)
{
Vector<String> addressLine;
@@ -139,7 +138,6 @@
return result;
}
-#endif
static ApplePayPaymentMethod convert(PKPaymentMethod *paymentMethod)
{
@@ -149,9 +147,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
