third_party/WebKit/Source/modules/payments/PaymentRequest.cpp - Issue 2137953002: Duplicate shipping option identifiers should throw TypeError.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

Issue 2137953002: Duplicate shipping option identifiers should throw TypeError. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: patch2 Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/payments/payment-request-interface.html ('k') | third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 386f630876a9c71a1349abdb661c91fee410b93f..106a1ef683bf74c246ec1c420579a8aa666e5ea1 100644

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

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

@@ -206,11 +206,17 @@ void validateDisplayItems(const HeapVector<PaymentItem>& items, ExceptionState&

void validateShippingOptions(const HeapVector<PaymentShippingOption>& options, ExceptionState& exceptionState)

{

+ HashSet<String> uniqueIds;

for (const auto& option : options) {

if (!option.hasId() || option.id().isEmpty()) {

exceptionState.throwTypeError("ShippingOption id required");

return;

}

please use gerrit instead 2016/07/12 10:01:16 nit: newline between the blocks.

+ if (uniqueIds.contains(option.id())) {

+ exceptionState.throwTypeError("Duplicate shipping option identifiers are not allowed");

+ return;

+ }

+ uniqueIds.add(option.id());

validateShippingOptionOrPaymentItem(option, exceptionState);

if (exceptionState.hadException())