PaymentRequest: Provide shippingAddress in PaymentResponse.

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 409 matching lines @@
     bool success = getExecutionContext()->getEventQueue()->enqueueEvent(event);
     DCHECK(success);
     ALLOW_UNUSED_LOCAL(success);
 }
 
 void PaymentRequest::OnPaymentResponse(mojom::blink::PaymentResponsePtr response)
 {
     DCHECK(m_showResolver);
     DCHECK(!m_completeResolver);
 
     if (response->shipping_address) {

[please use gerrit instead, 2016/06/06 01:09:34]

void PaymentRequest::OnPaymentResponse(mojom::blink::PaymentResponsePtr
response)
{
    DCHECK(m_showResolver);
    DCHECK(!m_completeResolver);

    if (m_options.requestShipping()) {
        if (!response->shipping_address) {
            m_showResolver->reject(DOMException::create(SyntaxError));
            clearResolversAndCloseMojoConnection();
            return;
        }

        String errorMessage;
        if
(!PaymentsValidators::isValidShippingAddress(response->shipping_address,
&errorMessage)) {
            ...

The spec says "This should never occur", but I don't know how much I can trust
the IPC message. (This data is coming from an IPC message.) Therefore, let's
handle it and reject the promise.

[zino, 2016/06/06 10:02:13]

Done.

         String errorMessage;
         if (!PaymentsValidators::isValidShippingAddress(response->shipping_address, &errorMessage)) {
             m_showResolver->reject(DOMException::create(SyntaxError, errorMessage));
             clearResolversAndCloseMojoConnection();
             return;
         }
 
-        m_shippingAddress = new PaymentAddress(std::move(response->shipping_address));
+        if (m_options.requestShipping())

[please use gerrit instead, 2016/06/06 01:09:34]

Replace this block with:

m_shippingAddress = new PaymentAddress(response->shipping_address->Clone());

[zino, 2016/06/06 10:02:13]

Done.

+            m_shippingAddress = new PaymentAddress(response->shipping_address->Clone());
+        else
+            m_shippingAddress = new PaymentAddress(std::move(response->shipping_address));
+
         m_shippingOption = response->shipping_option_id;
     }
 
     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();
 }
@@ skipping 17 matching lines @@
 void PaymentRequest::clearResolversAndCloseMojoConnection()
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink