Provide shipping in PaymentRequest response

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 291 matching lines @@
 {
     cleanUp();
 }
 
 void PaymentRequest::OnShippingAddressChange(mojom::blink::ShippingAddressPtr address)
 {
     DCHECK(m_showResolver);
     DCHECK(!m_completeResolver);
 
     String errorMessage;
-    if (!PaymentsValidators::isValidRegionCodeFormat(address->region_code, &errorMessage)
-        || !PaymentsValidators::isValidLanguageCodeFormat(address->language_code, &errorMessage)
-        || !PaymentsValidators::isValidScriptCodeFormat(address->script_code, &errorMessage)) {
+    if (!PaymentsValidators::isValidShippingAddress(address, &errorMessage)) {
         m_showResolver->reject(DOMException::create(SyntaxError, errorMessage));
         cleanUp();
         return;
     }
 
-    if (address->language_code.isEmpty() && !address->script_code.isEmpty()) {
-        m_showResolver->reject(DOMException::create(SyntaxError, "If language code is empty, then script code should also be empty"));
-        cleanUp();
-        return;
-    }
-
     m_shippingAddress = new ShippingAddress(std::move(address));
     Event* event = Event::create(EventTypeNames::shippingaddresschange);
     event->setTarget(this);
     getExecutionContext()->getEventQueue()->enqueueEvent(event);
 }
 
 void PaymentRequest::OnShippingOptionChange(const String& shippingOptionId)
 {
     DCHECK(m_showResolver);
     DCHECK(!m_completeResolver);
     m_shippingOption = shippingOptionId;
     Event* event = Event::create(EventTypeNames::shippingoptionchange);
     event->setTarget(this);
     getExecutionContext()->getEventQueue()->enqueueEvent(event);
 }
 
 void PaymentRequest::OnPaymentResponse(mojom::blink::PaymentResponsePtr response)
 {
     DCHECK(m_showResolver);
     DCHECK(!m_completeResolver);
+
+    if (response->shipping_address) {
+        String errorMessage;
+        if (!PaymentsValidators::isValidShippingAddress(response->shipping_address, &errorMessage)) {
+            m_showResolver->reject(DOMException::create(SyntaxError, errorMessage));
+            cleanUp();
+            return;
+        }
+
+        m_shippingAddress = new ShippingAddress(std::move(response->shipping_address));
+        m_shippingOption = response->shipping_option_id;
+    }
+
     m_showResolver->resolve(new PaymentResponse(std::move(response), this));
 }
 
 void PaymentRequest::OnError()
 {
     if (m_completeResolver)
         m_completeResolver->reject(DOMException::create(SyntaxError, "Request cancelled"));
     if (m_showResolver)
         m_showResolver->reject(DOMException::create(SyntaxError, "Request cancelled"));
     cleanUp();
 }
 
 void PaymentRequest::OnComplete()
 {
     DCHECK(m_completeResolver);
     m_completeResolver->resolve();
     cleanUp();
 }
 
 void PaymentRequest::cleanUp()
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink