PaymentRequest: Ignore shipping options if there are duplicated IDs.

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

Index: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
index fb01a7ba7708bb871637c854cd8f1de218a5b5df..ec17e2590d68417016122e1c7c43ab543c12cda2 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
@@ -223,8 +223,8 @@ void validateDisplayItems(const HeapVector<PaymentItem>& items,
   }
 }
 
-void validateShippingOptions(const HeapVector<PaymentShippingOption>& options,
-                             ExceptionState& exceptionState) {
+void validateAndFixupShippingOptions(HeapVector<PaymentShippingOption>& options,
+                                     ExceptionState& exceptionState) {
   HashSet<String> uniqueIds;
   for (const auto& option : options) {
     if (!option.hasId() || option.id().isEmpty()) {
@@ -233,8 +233,7 @@ void validateShippingOptions(const HeapVector<PaymentShippingOption>& options,
     }
 
     if (uniqueIds.contains(option.id())) {
-      exceptionState.throwTypeError(
-          "Duplicate shipping option identifiers are not allowed");
+      options = HeapVector<PaymentShippingOption>();
       return;
     }
     uniqueIds.add(option.id());
@@ -291,8 +290,8 @@ void validatePaymentDetailsModifiers(
   }
 }
 
-void validatePaymentDetails(const PaymentDetails& details,
-                            ExceptionState& exceptionState) {
+void validateAndFixupPaymentDetails(PaymentDetails& details,
+                                    ExceptionState& exceptionState) {
   if (!details.hasTotal()) {
     exceptionState.throwTypeError("Must specify total");
     return;
@@ -314,7 +313,10 @@ void validatePaymentDetails(const PaymentDetails& details,
   }
 
   if (details.hasShippingOptions()) {
-    validateShippingOptions(details.shippingOptions(), exceptionState);
+    HeapVector<PaymentShippingOption> fixedShippingOptions =

[please use gerrit instead, 2016/10/12 23:19:10]

Don't break this line. There's no character limit in Blink, technically. Also,
this line break adds no value.

[zino, 2016/10/13 01:46:24]

Good point.

But there *was* no character limit in Blink.
Recently, introduced a new presubmit rule to restrict character limit like
Chromium. 
I don't like the new style but it can cause presubmit warning if there is no
line-break.

+        details.shippingOptions();
+    validateAndFixupShippingOptions(fixedShippingOptions, exceptionState);
+    details.setShippingOptions(fixedShippingOptions);
     if (exceptionState.hadException())
       return;
   }
@@ -524,7 +526,7 @@ void PaymentRequest::onUpdatePaymentDetails(
     return;
   }
 
-  validatePaymentDetails(details, exceptionState);
+  validateAndFixupPaymentDetails(details, exceptionState);
   if (exceptionState.hadException()) {
     m_showResolver->reject(
         DOMException::create(SyntaxError, exceptionState.message()));
@@ -589,17 +591,18 @@ PaymentRequest::PaymentRequest(ScriptState* scriptState,
     return;
   }
 
-  validatePaymentDetails(details, exceptionState);
+  PaymentDetails fixedDetails(details);
+  validateAndFixupPaymentDetails(fixedDetails, exceptionState);
   if (exceptionState.hadException())
     return;
 
-  if (details.hasError() && !details.error().isEmpty()) {
+  if (fixedDetails.hasError() && !fixedDetails.error().isEmpty()) {
     exceptionState.throwTypeError("Error value should be empty");
     return;
   }
 
   if (m_options.requestShipping()) {
-    m_shippingOption = getSelectedShippingOption(details);
+    m_shippingOption = getSelectedShippingOption(fixedDetails);
     m_shippingType = getValidShippingType(m_options.shippingType());
   }
 
@@ -612,7 +615,7 @@ PaymentRequest::PaymentRequest(ScriptState* scriptState,
       m_clientBinding.CreateInterfacePtrAndBind(),
       mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::From(
           validatedMethodData),
-      mojom::blink::PaymentDetails::From(details),
+      mojom::blink::PaymentDetails::From(fixedDetails),
       mojom::blink::PaymentOptions::From(m_options));
 }