Adding support for phone and email.

third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/payments/PaymentRequest.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 433 matching lines @@
         m_shippingAddress = new PaymentAddress(response->shipping_address.Clone());
         m_shippingOption = response->shipping_option_id;
     } else {
         if (response->shipping_address) {
             m_showResolver->reject(DOMException::create(SyntaxError));
             clearResolversAndCloseMojoConnection();
             return;
         }
     }
 
+    if (m_options.requestPayerEmail() && !response->payer_email.isNull()) {

[zino, 2016/06/06 14:19:32]

I think it should be "if (m_options.requestPayerEmail() &&
!response->payer_email.isEmpty())".

[zino, 2016/06/06 14:19:32]

I'm not sure but the promise may have to reject if requestPayerEmail == true and
payer_email is null.

Because we can't trust the response data because it comes from browser side via
IPC.

On the other hands, does user have to select email unconditionally?

If not so, then requestPayerEmail is true but response->payer_email can be null.

What do you think rouslan@?

[please use gerrit instead, 2016/06/06 15:43:42]

The spec is not very clear on this topic. However, I think requestPayerEmail
expresses a requirement. Therefore, if response->payer_email is null, then we
should reject the show promise.

+        m_payerEmail = response->payer_email;

[please use gerrit instead, 2016/06/06 15:43:42]

There's no need to save email an phone as member variables. If they are null or
empty, then reject the promise. Otherwise, PaymentResponse will take them.

if (m_options.requestPayerEmail() && (response->payer_email.isNull() ||
response->payer_email.isEmpty())) {
  m_showResolver->reject(DOMException::create(SyntaxError));
  clearResolversAndCloseMojoConnection();
  return;
}

if (m_options.requestPayerPhone() && (response->payer_phone.isNull() ||
response->payer_phone.isEmpty())) {
  m_showResolver->reject(DOMException::create(SyntaxError));
  clearResolversAndCloseMojoConnection();
  return;
}

+    }
+
+    if (m_options.requestPayerPhone() && !response->payer_phone.isNull()) {

[zino, 2016/06/06 14:19:32]

ditto

+        m_payerPhone = response->payer_phone;
+    }
+
     m_showResolver->resolve(new PaymentResponse(std::move(response), this));
 
     // Do not close the mojo connection here. The merchant website should call
     // PaymentResponse::complete(boolean), which will be forwarded over the mojo
     // connection to display a success or failure message to the user.
     m_showResolver.clear();
 }
 
 void PaymentRequest::OnError()
 {
@@ skipping 14 matching lines @@
 void PaymentRequest::clearResolversAndCloseMojoConnection()
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink