Changeset 202644 in webkit
- Timestamp:
- Jun 29, 2016 1:14:30 PM (8 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r202643 r202644 1 2016-06-29 Anders Carlsson <andersca@apple.com> 2 3 Rename addressFields to contactFields 4 https://bugs.webkit.org/show_bug.cgi?id=159271 5 rdar://problem/27086955 6 7 Reviewed by Beth Dakin. 8 9 * Modules/applepay/ApplePaySession.cpp: 10 (WebCore::createContactFields): 11 (WebCore::isValidPaymentRequestPropertyName): 12 (WebCore::createPaymentRequest): 13 (WebCore::createAddressFields): Deleted. 14 * Modules/applepay/PaymentRequest.h: 15 (WebCore::PaymentRequest::requiredBillingContactFields): 16 (WebCore::PaymentRequest::setRequiredBillingContactFields): 17 (WebCore::PaymentRequest::requiredShippingContactFields): 18 (WebCore::PaymentRequest::setRequiredShippingContactFields): 19 (WebCore::PaymentRequest::requiredBillingAddressFields): Deleted. 20 (WebCore::PaymentRequest::setRequiredBillingAddressFields): Deleted. 21 (WebCore::PaymentRequest::requiredShippingAddressFields): Deleted. 22 (WebCore::PaymentRequest::setRequiredShippingAddressFields): Deleted. 23 1 24 2016-06-29 Jiewen Tan <jiewen_tan@apple.com> 2 25 -
trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp
r202584 r202644 46 46 #include "MainFrame.h" 47 47 #include "Page.h" 48 #include "PageConsoleClient.h" 48 49 #include "PaymentAuthorizationStatus.h" 49 50 #include "PaymentContact.h" … … 163 164 } 164 165 165 static Optional<PaymentRequest:: AddressFields> createAddressFields(DOMWindow& window, const ArrayValue& addressFieldsArray)166 { 167 PaymentRequest:: AddressFields result;168 169 size_t addressFieldsCount;170 if (! addressFieldsArray.length(addressFieldsCount))166 static Optional<PaymentRequest::ContactFields> createContactFields(DOMWindow& window, const ArrayValue& contactFieldsArray) 167 { 168 PaymentRequest::ContactFields result; 169 170 size_t contactFieldsCount; 171 if (!contactFieldsArray.length(contactFieldsCount)) 171 172 return Nullopt; 172 173 173 for (size_t i = 0; i < addressFieldsCount; ++i) {174 String addressField;175 if (! addressFieldsArray.get(i, addressField))176 return Nullopt; 177 178 if ( addressField == "postalAddress")174 for (size_t i = 0; i < contactFieldsCount; ++i) { 175 String contactField; 176 if (!contactFieldsArray.get(i, contactField)) 177 return Nullopt; 178 179 if (contactField == "postalAddress") 179 180 result.postalAddress = true; 180 else if ( addressField == "phone")181 else if (contactField == "phone") 181 182 result.phone = true; 182 else if ( addressField == "email")183 else if (contactField == "email") 183 184 result.email = true; 184 else if ( addressField == "name")185 else if (contactField == "name") 185 186 result.name = true; 186 187 else { 187 auto message = makeString("\"" + addressField, "\" is not a valid addressfield.");188 auto message = makeString("\"" + contactField, "\" is not a valid contact field."); 188 189 window.printErrorMessage(message); 189 190 return Nullopt; … … 463 464 "countryCode", 464 465 "currencyCode", 465 "requiredBilling AddressFields",466 "requiredBillingContactFields", 466 467 "billingContact", 467 "requiredShipping AddressFields",468 "requiredShippingContactFields", 468 469 "shippingContact", 469 470 "shippingType", … … 472 473 "lineItems", 473 474 "applicationData", 475 476 // FIXME: Get rid of these. 477 "requiredBillingAddressFields", 478 "requiredShippingAddressFields", 474 479 }; 475 480 … … 518 523 paymentRequest.setCurrencyCode(*currencyCode); 519 524 520 if (auto requiredBillingAddressFieldsArray = dictionary.get<ArrayValue>("requiredBillingAddressFields")) { 521 auto requiredBillingAddressFields = createAddressFields(window, *requiredBillingAddressFieldsArray); 525 if (auto requiredBillingContactFieldsArray = dictionary.get<ArrayValue>("requiredBillingContactFields")) { 526 auto requiredBillingContactFields = createContactFields(window, *requiredBillingContactFieldsArray); 527 if (!requiredBillingContactFields) 528 return Nullopt; 529 530 paymentRequest.setRequiredBillingContactFields(*requiredBillingContactFields); 531 } else if (auto requiredBillingAddressFieldsArray = dictionary.get<ArrayValue>("requiredBillingAddressFields")) { 532 if (PageConsoleClient* pageConsole = window.console()) 533 pageConsole->addMessage(MessageSource::JS, MessageLevel::Warning, "\"requiredShippingAddressFields\" has been deprecated and will stop working shortly. Please switch to \"requiredShippingContactFields\" instead."); 534 535 auto requiredBillingAddressFields = createContactFields(window, *requiredBillingAddressFieldsArray); 522 536 if (!requiredBillingAddressFields) 523 537 return Nullopt; 524 538 525 paymentRequest.setRequiredBillingAddressFields(*requiredBillingAddressFields); 526 } 539 paymentRequest.setRequiredBillingContactFields(*requiredBillingAddressFields); 540 } 541 527 542 528 543 if (auto billingContactValue = dictionary.get<JSC::JSValue>("billingContact")) { … … 537 552 } 538 553 539 if (auto requiredShippingAddressFieldsArray = dictionary.get<ArrayValue>("requiredShippingAddressFields")) { 540 auto requiredShippingAddressFields = createAddressFields(window, *requiredShippingAddressFieldsArray); 554 if (auto requiredShippingContactFieldsArray = dictionary.get<ArrayValue>("requiredShippingContactFields")) { 555 auto requiredShippingContactFields = createContactFields(window, *requiredShippingContactFieldsArray); 556 if (!requiredShippingContactFields) 557 return Nullopt; 558 559 paymentRequest.setRequiredShippingContactFields(*requiredShippingContactFields); 560 } else if (auto requiredShippingAddressFieldsArray = dictionary.get<ArrayValue>("requiredShippingAddressFields")) { 561 if (PageConsoleClient* pageConsole = window.console()) 562 pageConsole->addMessage(MessageSource::JS, MessageLevel::Warning, "\"requiredShippingAddressFields\" has been deprecated and will stop working shortly. Please switch to \"requiredShippingContactFields\" instead."); 563 564 auto requiredShippingAddressFields = createContactFields(window, *requiredShippingAddressFieldsArray); 541 565 if (!requiredShippingAddressFields) 542 566 return Nullopt; 543 567 544 paymentRequest.setRequiredShippingAddressFields(*requiredShippingAddressFields); 545 } 568 paymentRequest.setRequiredShippingContactFields(*requiredShippingAddressFields); 569 } 570 546 571 547 572 if (auto shippingContactValue = dictionary.get<JSC::JSValue>("shippingContact")) { -
trunk/Source/WebCore/Modules/applepay/PaymentRequest.h
r202341 r202644 46 46 void setCurrencyCode(const String& currencyCode) { m_currencyCode = currencyCode; } 47 47 48 struct AddressFields {48 struct ContactFields { 49 49 bool postalAddress { false }; 50 50 bool phone { false }; … … 53 53 }; 54 54 55 const AddressFields& requiredBillingAddressFields() const { return m_requiredBillingAddressFields; }56 void setRequiredBilling AddressFields(const AddressFields& requiredBillingAddressFields) { m_requiredBillingAddressFields = requiredBillingAddressFields; }55 const ContactFields& requiredBillingContactFields() const { return m_requiredBillingContactFields; } 56 void setRequiredBillingContactFields(const ContactFields& requiredBillingContactFields) { m_requiredBillingContactFields = requiredBillingContactFields; } 57 57 58 58 const PaymentContact& billingContact() const { return m_billingContact; } 59 59 void setBillingContact(const PaymentContact& billingContact) { m_billingContact = billingContact; } 60 60 61 const AddressFields& requiredShippingAddressFields() const { return m_requiredShippingAddressFields; }62 void setRequiredShipping AddressFields(const AddressFields& requiredShippingAddressFields) { m_requiredShippingAddressFields = requiredShippingAddressFields; }61 const ContactFields& requiredShippingContactFields() const { return m_requiredShippingContactFields; } 62 void setRequiredShippingContactFields(const ContactFields& requiredShippingContactFields) { m_requiredShippingContactFields = requiredShippingContactFields; } 63 63 64 64 const PaymentContact& shippingContact() const { return m_shippingContact; } … … 138 138 String m_currencyCode; 139 139 140 AddressFields m_requiredBillingAddressFields;140 ContactFields m_requiredBillingContactFields; 141 141 PaymentContact m_billingContact; 142 142 143 AddressFields m_requiredShippingAddressFields;143 ContactFields m_requiredShippingContactFields; 144 144 PaymentContact m_shippingContact; 145 145 -
trunk/Source/WebKit2/ChangeLog
r202642 r202644 1 2016-06-29 Anders Carlsson <andersca@apple.com> 2 3 Rename addressFields to contactFields 4 https://bugs.webkit.org/show_bug.cgi?id=159271 5 rdar://problem/27086955 6 7 Reviewed by Beth Dakin. 8 9 * Shared/Cocoa/WebCoreArgumentCodersCocoa.mm: 10 (IPC::ArgumentCoder<PaymentRequest>::encode): 11 (IPC::ArgumentCoder<PaymentRequest>::decode): 12 (IPC::ArgumentCoder<PaymentRequest::ContactFields>::encode): 13 (IPC::ArgumentCoder<PaymentRequest::ContactFields>::decode): 14 (IPC::ArgumentCoder<PaymentRequest::AddressFields>::encode): Deleted. 15 (IPC::ArgumentCoder<PaymentRequest::AddressFields>::decode): Deleted. 16 * Shared/WebCoreArgumentCoders.h: 17 * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm: 18 (WebKit::toPKAddressField): 19 (WebKit::toPKPaymentRequest): 20 1 21 2016-06-29 Jer Noble <jer.noble@apple.com> 2 22 -
trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm
r202581 r202644 189 189 encoder << request.countryCode(); 190 190 encoder << request.currencyCode(); 191 encoder << request.requiredBilling AddressFields();191 encoder << request.requiredBillingContactFields(); 192 192 encoder << request.billingContact(); 193 encoder << request.requiredShipping AddressFields();193 encoder << request.requiredShippingContactFields(); 194 194 encoder << request.shippingContact(); 195 195 encoder << request.merchantCapabilities(); … … 214 214 request.setCurrencyCode(currencyCode); 215 215 216 PaymentRequest:: AddressFields requiredBillingAddressFields;217 if (!decoder.decode((requiredBilling AddressFields)))218 return false; 219 request.setRequiredBilling AddressFields(requiredBillingAddressFields);216 PaymentRequest::ContactFields requiredBillingContactFields; 217 if (!decoder.decode((requiredBillingContactFields))) 218 return false; 219 request.setRequiredBillingContactFields(requiredBillingContactFields); 220 220 221 221 PaymentContact billingContact; … … 224 224 request.setBillingContact(billingContact); 225 225 226 PaymentRequest:: AddressFields requiredShippingAddressFields;227 if (!decoder.decode((requiredShipping AddressFields)))228 return false; 229 request.setRequiredShipping AddressFields(requiredShippingAddressFields);226 PaymentRequest::ContactFields requiredShippingContactFields; 227 if (!decoder.decode((requiredShippingContactFields))) 228 return false; 229 request.setRequiredShippingContactFields(requiredShippingContactFields); 230 230 231 231 PaymentContact shippingContact; … … 272 272 } 273 273 274 void ArgumentCoder<PaymentRequest:: AddressFields>::encode(ArgumentEncoder& encoder, const PaymentRequest::AddressFields& addressFields)275 { 276 encoder << addressFields.postalAddress;277 encoder << addressFields.phone;278 encoder << addressFields.email;279 encoder << addressFields.name;280 } 281 282 bool ArgumentCoder<PaymentRequest:: AddressFields>::decode(ArgumentDecoder& decoder, PaymentRequest::AddressFields& addressFields)283 { 284 if (!decoder.decode( addressFields.postalAddress))285 return false; 286 if (!decoder.decode( addressFields.phone))287 return false; 288 if (!decoder.decode( addressFields.email))289 return false; 290 if (!decoder.decode( addressFields.name))274 void ArgumentCoder<PaymentRequest::ContactFields>::encode(ArgumentEncoder& encoder, const PaymentRequest::ContactFields& contactFields) 275 { 276 encoder << contactFields.postalAddress; 277 encoder << contactFields.phone; 278 encoder << contactFields.email; 279 encoder << contactFields.name; 280 } 281 282 bool ArgumentCoder<PaymentRequest::ContactFields>::decode(ArgumentDecoder& decoder, PaymentRequest::ContactFields& contactFields) 283 { 284 if (!decoder.decode(contactFields.postalAddress)) 285 return false; 286 if (!decoder.decode(contactFields.phone)) 287 return false; 288 if (!decoder.decode(contactFields.email)) 289 return false; 290 if (!decoder.decode(contactFields.name)) 291 291 return false; 292 292 -
trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h
r202444 r202644 502 502 }; 503 503 504 template<> struct ArgumentCoder<WebCore::PaymentRequest:: AddressFields> {505 static void encode(ArgumentEncoder&, const WebCore::PaymentRequest:: AddressFields&);506 static bool decode(ArgumentDecoder&, WebCore::PaymentRequest:: AddressFields&);504 template<> struct ArgumentCoder<WebCore::PaymentRequest::ContactFields> { 505 static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::ContactFields&); 506 static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::ContactFields&); 507 507 }; 508 508 -
trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
r202581 r202644 231 231 } 232 232 233 static PKAddressField toPKAddressField(const WebCore::PaymentRequest:: AddressFields& addressFields)233 static PKAddressField toPKAddressField(const WebCore::PaymentRequest::ContactFields& contactFields) 234 234 { 235 235 PKAddressField result = 0; 236 236 237 if ( addressFields.postalAddress)237 if (contactFields.postalAddress) 238 238 result |= PKAddressFieldPostalAddress; 239 if ( addressFields.phone)239 if (contactFields.phone) 240 240 result |= PKAddressFieldPhone; 241 if ( addressFields.email)241 if (contactFields.email) 242 242 result |= PKAddressFieldEmail; 243 if ( addressFields.name)243 if (contactFields.name) 244 244 result |= PKAddressFieldName; 245 245 … … 348 348 [result setCountryCode:paymentRequest.countryCode()]; 349 349 [result setCurrencyCode:paymentRequest.currencyCode()]; 350 [result setRequiredBillingAddressFields:toPKAddressField(paymentRequest.requiredBilling AddressFields())];350 [result setRequiredBillingAddressFields:toPKAddressField(paymentRequest.requiredBillingContactFields())]; 351 351 [result setBillingContact:paymentRequest.billingContact().pkContact()]; 352 [result setRequiredShippingAddressFields:toPKAddressField(paymentRequest.requiredShipping AddressFields())];352 [result setRequiredShippingAddressFields:toPKAddressField(paymentRequest.requiredShippingContactFields())]; 353 353 [result setShippingContact:paymentRequest.shippingContact().pkContact()]; 354 354
Note: See TracChangeset
for help on using the changeset viewer.