Title: [259050] trunk/Source/WebCore
- Revision
- 259050
- Author
- nmouchta...@apple.com
- Date
- 2020-03-26 10:42:43 -0700 (Thu, 26 Mar 2020)
Log Message
Remove manual redacting of billing contact after wallet fix for rdar://problem/59075234
https://bugs.webkit.org/show_bug.cgi?id=209557
<rdar://problem/60883506>
Reviewed by Andy Estes.
Removed manual redaction of billing address after wallet fixed
their redaction code.
No new tests. Current tests cover this functionality.
* Modules/applepay/cocoa/PaymentMethodCocoa.mm:
(WebCore::convert):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (259049 => 259050)
--- trunk/Source/WebCore/ChangeLog 2020-03-26 17:04:14 UTC (rev 259049)
+++ trunk/Source/WebCore/ChangeLog 2020-03-26 17:42:43 UTC (rev 259050)
@@ -1,3 +1,19 @@
+2020-03-26 Nikos Mouchtaris <nmouchta...@apple.com>
+
+ Remove manual redacting of billing contact after wallet fix for rdar://problem/59075234
+ https://bugs.webkit.org/show_bug.cgi?id=209557
+ <rdar://problem/60883506>
+
+ Reviewed by Andy Estes.
+
+ Removed manual redaction of billing address after wallet fixed
+ their redaction code.
+
+ No new tests. Current tests cover this functionality.
+
+ * Modules/applepay/cocoa/PaymentMethodCocoa.mm:
+ (WebCore::convert):
+
2020-03-26 Per Arne Vollan <pvol...@apple.com>
[iOS] Adopt ScreenProperties class.
Modified: trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm (259049 => 259050)
--- trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm 2020-03-26 17:04:14 UTC (rev 259049)
+++ trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm 2020-03-26 17:42:43 UTC (rev 259050)
@@ -40,19 +40,6 @@
}
#endif
-// Allowed billingAddress fields
-// Awaiting fix for rdar://problem/59075234
-#define ALLOW_COUNTRY 1
-#define ALLOW_COUNTRY_CODE 1
-#define ALLOW_ADMIN_AREA 1
-#define ALLOW_POSTAL_CODE 0
-#define ALLOW_SUB_ADMIN_AREA 0
-#define ALLOW_ADDRESS_LINES 0
-#define ALLOW_SUB_LOCALITY 0
-#define ALLOW_LOCALITY 0
-
-#define ALLOW(FIELD) (ALLOW_##FIELD == 1)
-
namespace WebCore {
static ApplePayPaymentPass::ActivationState convert(PKPaymentPassActivationState paymentPassActivationState)
@@ -110,34 +97,18 @@
#if HAVE(PASSKIT_PAYMENT_METHOD_BILLING_ADDRESS)
static void convert(CNLabeledValue<CNPostalAddress*> *postalAddress, ApplePayPaymentContact &result)
{
-#if ALLOW(SUB_LOCALITY)
Vector<String> addressLine;
if (NSString *street = postalAddress.value.street) {
addressLine.append(street);
- result.addressLine = WTFMove(addressLine);
+ result.addressLines = WTFMove(addressLine);
}
-#endif
-#if ALLOW(SUB_LOCALITY)
result.subLocality = postalAddress.value.subLocality;
-#endif
-#if ALLOW(LOCALITY)
result.locality = postalAddress.value.city;
-#endif
-#if ALLOW(SUB_ADMIN_AREA)
result.subAdministrativeArea = postalAddress.value.subAdministrativeArea;
-#endif
-#if ALLOW(ADMIN_AREA)
result.administrativeArea = postalAddress.value.state;
-#endif
-#if ALLOW(POSTAL_CODE)
result.postalCode = postalAddress.value.postalCode;
-#endif
-#if ALLOW(COUNTRY)
result.country = postalAddress.value.country;
-#endif
-#if ALLOW(COUNTRY_CODE)
result.countryCode = postalAddress.value.ISOCountryCode;
-#endif
}
static Optional<ApplePayPaymentContact> convert(CNContact *billingContact)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
