Add 'selected' boolean to 'ShippingOption'

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 52 matching lines @@
 };
 
 template <>
 struct TypeConverter<ShippingOptionPtr, blink::ShippingOption> {
     static ShippingOptionPtr Convert(const blink::ShippingOption& input)
     {
         ShippingOptionPtr output = ShippingOption::New();
         output->id = input.id();
         output->label = input.label();
         output->amount = CurrencyAmount::From(input.amount());
+        output->selected = input.hasSelected() && input.selected();
         return output;
     }
 };
 
 template <>
 struct TypeConverter<PaymentDetailsPtr, blink::PaymentDetails> {
     static PaymentDetailsPtr Convert(const blink::PaymentDetails& input)
     {
         PaymentDetailsPtr output = PaymentDetails::New();
         output->total = PaymentItem::From(input.total());
@@ skipping 107 matching lines @@
         validateDisplayItems(details.displayItems(), exceptionState);
         if (exceptionState.hadException())
             return;
     }
 
     if (details.hasShippingOptions()) {
         validateShippingOptions(details.shippingOptions(), exceptionState);
     }
 }
 
+String getSelectedShippingOption(const PaymentDetails& details)
+{
+    String result;
+    if (!details.hasShippingOptions())
+        return result;
+
+    for (size_t i = 0; i < details.shippingOptions().size(); ++i) {
+        if (details.shippingOptions()[i].hasSelected() && details.shippingOptions()[i].selected()) {
+            result = details.shippingOptions()[i].id();
+        }
+    }
+
+    return result;
+}
+
 } // namespace
 
 PaymentRequest* PaymentRequest::create(ScriptState* scriptState, const Vector<String>& supportedMethods, const PaymentDetails& details, ExceptionState& exceptionState)
 {
     return new PaymentRequest(scriptState, supportedMethods, details, PaymentOptions(), ScriptValue(), exceptionState);
 }
 
 PaymentRequest* PaymentRequest::create(ScriptState* scriptState, const Vector<String>& supportedMethods, const PaymentDetails& details, const PaymentOptions& options, ExceptionState& exceptionState)
 {
     return new PaymentRequest(scriptState, supportedMethods, details, options, ScriptValue(), exceptionState);
@@ skipping 72 matching lines @@
         return;
     }
 
     validatePaymentDetails(details, exceptionState);
     if (exceptionState.hadException()) {
         m_showResolver->reject(DOMException::create(SyntaxError, exceptionState.message()));
         clearResolversAndCloseMojoConnection();
         return;
     }
 
-    // Set the currently selected option if only one option was passed.

[Marijn Kruisselbrink, 2016/06/07 00:31:37]

According to the spec having exactly one option should still result in that
option being selected even without a selected=true?

[please use gerrit instead, 2016/06/07 00:52:22]

I am told the spec is going to change in this direction shortly. Should I wait
for the spec update to review/land this?

-    if (details.hasShippingOptions() && details.shippingOptions().size() == 1)
-        m_shippingOption = details.shippingOptions().begin()->id();
-    else
-        m_shippingOption = String();
+    if (m_options.requestShipping())
+        m_shippingOption = getSelectedShippingOption(details);
 
     m_paymentProvider->UpdateWith(mojom::blink::PaymentDetails::From(details));
 }
 
 void PaymentRequest::onUpdatePaymentDetailsFailure(const ScriptValue& error)
 {
     if (m_showResolver)
         m_showResolver->reject(error);
     if (m_completeResolver)
         m_completeResolver->reject(error);
@@ skipping 59 matching lines @@
                 if (paymentMethodSpecificKeyValue.value->getType() != JSONValue::TypeObject) {
                     exceptionState.throwTypeError("Data for '" + paymentMethodSpecificKeyValue.key + "' should be a JSON-serializable object");
                     return;
                 }
             }
 
             m_stringifiedData = jsonData->toJSONString();
         }
     }
 
-    // Set the currently selected option if only one option is passed and shipping is requested.
-    if (options.requestShipping() && details.hasShippingOptions() && details.shippingOptions().size() == 1)
-        m_shippingOption = details.shippingOptions().begin()->id();
+    if (m_options.requestShipping())
+        m_shippingOption = getSelectedShippingOption(details);
 }
 
 void PaymentRequest::contextDestroyed()
 {
     clearResolversAndCloseMojoConnection();
 }
 
 bool PaymentRequest::hasPendingActivity() const
 {
     return m_showResolver || m_completeResolver;
@@ skipping 77 matching lines @@
 void PaymentRequest::clearResolversAndCloseMojoConnection()
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink