Changeset 202644 in webkit


Ignore:
Timestamp:
Jun 29, 2016 1:14:30 PM (8 years ago)
Author:
andersca@apple.com
Message:

Rename addressFields to contactFields
https://bugs.webkit.org/show_bug.cgi?id=159271
rdar://problem/27086955

Reviewed by Beth Dakin.

Source/WebCore:

  • Modules/applepay/ApplePaySession.cpp:

(WebCore::createContactFields):
(WebCore::isValidPaymentRequestPropertyName):
(WebCore::createPaymentRequest):
(WebCore::createAddressFields): Deleted.

  • Modules/applepay/PaymentRequest.h:

(WebCore::PaymentRequest::requiredBillingContactFields):
(WebCore::PaymentRequest::setRequiredBillingContactFields):
(WebCore::PaymentRequest::requiredShippingContactFields):
(WebCore::PaymentRequest::setRequiredShippingContactFields):
(WebCore::PaymentRequest::requiredBillingAddressFields): Deleted.
(WebCore::PaymentRequest::setRequiredBillingAddressFields): Deleted.
(WebCore::PaymentRequest::requiredShippingAddressFields): Deleted.
(WebCore::PaymentRequest::setRequiredShippingAddressFields): Deleted.

Source/WebKit2:

  • Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:

(IPC::ArgumentCoder<PaymentRequest>::encode):
(IPC::ArgumentCoder<PaymentRequest>::decode):
(IPC::ArgumentCoder<PaymentRequest::ContactFields>::encode):
(IPC::ArgumentCoder<PaymentRequest::ContactFields>::decode):
(IPC::ArgumentCoder<PaymentRequest::AddressFields>::encode): Deleted.
(IPC::ArgumentCoder<PaymentRequest::AddressFields>::decode): Deleted.

  • Shared/WebCoreArgumentCoders.h:
  • UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:

(WebKit::toPKAddressField):
(WebKit::toPKPaymentRequest):

Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r202643 r202644  
     12016-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
    1242016-06-29  Jiewen Tan  <jiewen_tan@apple.com>
    225
  • trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp

    r202584 r202644  
    4646#include "MainFrame.h"
    4747#include "Page.h"
     48#include "PageConsoleClient.h"
    4849#include "PaymentAuthorizationStatus.h"
    4950#include "PaymentContact.h"
     
    163164}
    164165
    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))
     166static Optional<PaymentRequest::ContactFields> createContactFields(DOMWindow& window, const ArrayValue& contactFieldsArray)
     167{
     168    PaymentRequest::ContactFields result;
     169
     170    size_t contactFieldsCount;
     171    if (!contactFieldsArray.length(contactFieldsCount))
    171172        return Nullopt;
    172173
    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")
    179180            result.postalAddress = true;
    180         else if (addressField == "phone")
     181        else if (contactField == "phone")
    181182            result.phone = true;
    182         else if (addressField == "email")
     183        else if (contactField == "email")
    183184            result.email = true;
    184         else if (addressField == "name")
     185        else if (contactField == "name")
    185186            result.name = true;
    186187        else {
    187             auto message = makeString("\"" + addressField, "\" is not a valid address field.");
     188            auto message = makeString("\"" + contactField, "\" is not a valid contact field.");
    188189            window.printErrorMessage(message);
    189190            return Nullopt;
     
    463464        "countryCode",
    464465        "currencyCode",
    465         "requiredBillingAddressFields",
     466        "requiredBillingContactFields",
    466467        "billingContact",
    467         "requiredShippingAddressFields",
     468        "requiredShippingContactFields",
    468469        "shippingContact",
    469470        "shippingType",
     
    472473        "lineItems",
    473474        "applicationData",
     475
     476        // FIXME: Get rid of these.
     477        "requiredBillingAddressFields",
     478        "requiredShippingAddressFields",
    474479    };
    475480
     
    518523        paymentRequest.setCurrencyCode(*currencyCode);
    519524
    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);
    522536        if (!requiredBillingAddressFields)
    523537            return Nullopt;
    524538
    525         paymentRequest.setRequiredBillingAddressFields(*requiredBillingAddressFields);
    526     }
     539        paymentRequest.setRequiredBillingContactFields(*requiredBillingAddressFields);
     540    }
     541
    527542
    528543    if (auto billingContactValue = dictionary.get<JSC::JSValue>("billingContact")) {
     
    537552    }
    538553
    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);
    541565        if (!requiredShippingAddressFields)
    542566            return Nullopt;
    543567
    544         paymentRequest.setRequiredShippingAddressFields(*requiredShippingAddressFields);
    545     }
     568        paymentRequest.setRequiredShippingContactFields(*requiredShippingAddressFields);
     569    }
     570
    546571
    547572    if (auto shippingContactValue = dictionary.get<JSC::JSValue>("shippingContact")) {
  • trunk/Source/WebCore/Modules/applepay/PaymentRequest.h

    r202341 r202644  
    4646    void setCurrencyCode(const String& currencyCode) { m_currencyCode = currencyCode; }
    4747
    48     struct AddressFields {
     48    struct ContactFields {
    4949        bool postalAddress { false };
    5050        bool phone { false };
     
    5353    };
    5454
    55     const AddressFields& requiredBillingAddressFields() const { return m_requiredBillingAddressFields; }
    56     void setRequiredBillingAddressFields(const AddressFields& requiredBillingAddressFields) { m_requiredBillingAddressFields = requiredBillingAddressFields; }
     55    const ContactFields& requiredBillingContactFields() const { return m_requiredBillingContactFields; }
     56    void setRequiredBillingContactFields(const ContactFields& requiredBillingContactFields) { m_requiredBillingContactFields = requiredBillingContactFields; }
    5757
    5858    const PaymentContact& billingContact() const { return m_billingContact; }
    5959    void setBillingContact(const PaymentContact& billingContact) { m_billingContact = billingContact; }
    6060
    61     const AddressFields& requiredShippingAddressFields() const { return m_requiredShippingAddressFields; }
    62     void setRequiredShippingAddressFields(const AddressFields& requiredShippingAddressFields) { m_requiredShippingAddressFields = requiredShippingAddressFields; }
     61    const ContactFields& requiredShippingContactFields() const { return m_requiredShippingContactFields; }
     62    void setRequiredShippingContactFields(const ContactFields& requiredShippingContactFields) { m_requiredShippingContactFields = requiredShippingContactFields; }
    6363
    6464    const PaymentContact& shippingContact() const { return m_shippingContact; }
     
    138138    String m_currencyCode;
    139139
    140     AddressFields m_requiredBillingAddressFields;
     140    ContactFields m_requiredBillingContactFields;
    141141    PaymentContact m_billingContact;
    142142
    143     AddressFields m_requiredShippingAddressFields;
     143    ContactFields m_requiredShippingContactFields;
    144144    PaymentContact m_shippingContact;
    145145
  • trunk/Source/WebKit2/ChangeLog

    r202642 r202644  
     12016-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
    1212016-06-29  Jer Noble  <jer.noble@apple.com>
    222
  • trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm

    r202581 r202644  
    189189    encoder << request.countryCode();
    190190    encoder << request.currencyCode();
    191     encoder << request.requiredBillingAddressFields();
     191    encoder << request.requiredBillingContactFields();
    192192    encoder << request.billingContact();
    193     encoder << request.requiredShippingAddressFields();
     193    encoder << request.requiredShippingContactFields();
    194194    encoder << request.shippingContact();
    195195    encoder << request.merchantCapabilities();
     
    214214    request.setCurrencyCode(currencyCode);
    215215
    216     PaymentRequest::AddressFields requiredBillingAddressFields;
    217     if (!decoder.decode((requiredBillingAddressFields)))
    218         return false;
    219     request.setRequiredBillingAddressFields(requiredBillingAddressFields);
     216    PaymentRequest::ContactFields requiredBillingContactFields;
     217    if (!decoder.decode((requiredBillingContactFields)))
     218        return false;
     219    request.setRequiredBillingContactFields(requiredBillingContactFields);
    220220
    221221    PaymentContact billingContact;
     
    224224    request.setBillingContact(billingContact);
    225225
    226     PaymentRequest::AddressFields requiredShippingAddressFields;
    227     if (!decoder.decode((requiredShippingAddressFields)))
    228         return false;
    229     request.setRequiredShippingAddressFields(requiredShippingAddressFields);
     226    PaymentRequest::ContactFields requiredShippingContactFields;
     227    if (!decoder.decode((requiredShippingContactFields)))
     228        return false;
     229    request.setRequiredShippingContactFields(requiredShippingContactFields);
    230230
    231231    PaymentContact shippingContact;
     
    272272}
    273273
    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))
     274void 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
     282bool 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))
    291291        return false;
    292292
  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

    r202444 r202644  
    502502};
    503503
    504 template<> struct ArgumentCoder<WebCore::PaymentRequest::AddressFields> {
    505     static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::AddressFields&);
    506     static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::AddressFields&);
     504template<> struct ArgumentCoder<WebCore::PaymentRequest::ContactFields> {
     505    static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::ContactFields&);
     506    static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::ContactFields&);
    507507};
    508508
  • trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm

    r202581 r202644  
    231231}
    232232
    233 static PKAddressField toPKAddressField(const WebCore::PaymentRequest::AddressFields& addressFields)
     233static PKAddressField toPKAddressField(const WebCore::PaymentRequest::ContactFields& contactFields)
    234234{
    235235    PKAddressField result = 0;
    236236
    237     if (addressFields.postalAddress)
     237    if (contactFields.postalAddress)
    238238        result |= PKAddressFieldPostalAddress;
    239     if (addressFields.phone)
     239    if (contactFields.phone)
    240240        result |= PKAddressFieldPhone;
    241     if (addressFields.email)
     241    if (contactFields.email)
    242242        result |= PKAddressFieldEmail;
    243     if (addressFields.name)
     243    if (contactFields.name)
    244244        result |= PKAddressFieldName;
    245245
     
    348348    [result setCountryCode:paymentRequest.countryCode()];
    349349    [result setCurrencyCode:paymentRequest.currencyCode()];
    350     [result setRequiredBillingAddressFields:toPKAddressField(paymentRequest.requiredBillingAddressFields())];
     350    [result setRequiredBillingAddressFields:toPKAddressField(paymentRequest.requiredBillingContactFields())];
    351351    [result setBillingContact:paymentRequest.billingContact().pkContact()];
    352     [result setRequiredShippingAddressFields:toPKAddressField(paymentRequest.requiredShippingAddressFields())];
     352    [result setRequiredShippingAddressFields:toPKAddressField(paymentRequest.requiredShippingContactFields())];
    353353    [result setShippingContact:paymentRequest.shippingContact().pkContact()];
    354354
Note: See TracChangeset for help on using the changeset viewer.