PaymentRequest: Add support for shipping type. (in blink side)

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 343 matching lines @@
 
     for (int i = details.shippingOptions().size() - 1; i >= 0; --i) {
         if (details.shippingOptions()[i].hasSelected() && details.shippingOptions()[i].selected()) {
             return details.shippingOptions()[i].id();
         }
     }
 
     return result;
 }
 
+String getValidShippingType(const String& shippingType)
+{
+    const char* validValues[] = {
+        "shipping",
+        "delivery",
+        "pickup",
+    };

[please use gerrit instead, 2016/09/18 16:54:56]

Is this allocated on the stack? We would not want to return pointers that are
about to be invalidated. It's safer to place the array outside of the function,
unless you can show that I was wrong :-)

[zino, 2016/09/18 18:57:40]

Good point.
I changed it to static const char* const type.
For readability, I thought it's better to place the array inside of this
function.
But if you don't like this, I'll make it place outside again. :)

+    for (size_t i = 0; i < WTF_ARRAY_LENGTH(validValues); i++) {
+        if (shippingType == validValues[i])
+            return shippingType;
+    }
+    return validValues[0];
+}
+
 } // namespace
 
 PaymentRequest* PaymentRequest::create(ScriptState* scriptState, const HeapVector<PaymentMethodData>& methodData, const PaymentDetails& details, ExceptionState& exceptionState)
 {
     return new PaymentRequest(scriptState, methodData, details, PaymentOptions(), exceptionState);
 }
 
 PaymentRequest* PaymentRequest::create(ScriptState* scriptState, const HeapVector<PaymentMethodData>& methodData, const PaymentDetails& details, const PaymentOptions& options, ExceptionState& exceptionState)
 {
     return new PaymentRequest(scriptState, methodData, details, options, exceptionState);
@@ skipping 138 matching lines @@
 
     if (!scriptState->domWindow()->frame() || !scriptState->domWindow()->frame()->isMainFrame()) {
         exceptionState.throwSecurityError("Must be in a top-level browsing context");
         return;
     }
 
     validatePaymentDetails(details, exceptionState);
     if (exceptionState.hadException())
         return;
 
-    if (m_options.requestShipping())
+    if (m_options.requestShipping()) {
         m_shippingOption = getSelectedShippingOption(details);
+        m_shippingType = getValidShippingType(m_options.shippingType());
+    }
 
     scriptState->domWindow()->frame()->interfaceProvider()->getInterface(mojo::GetProxy(&m_paymentProvider));
     m_paymentProvider.set_connection_error_handler(convertToBaseCallback(WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this), mojom::blink::PaymentErrorReason::UNKNOWN)));
     m_paymentProvider->Init(m_clientBinding.CreateInterfacePtrAndBind(), mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::From(validatedMethodData), mojom::blink::PaymentDetails::From(details), mojom::blink::PaymentOptions::From(m_options));
 }
 
 void PaymentRequest::contextDestroyed()
 {
     clearResolversAndCloseMojoConnection();
 }
@@ skipping 162 matching lines @@
     m_completeTimer.stop();
     m_completeResolver.clear();
     m_showResolver.clear();
     m_abortResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink