Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: third_party/WebKit/Source/modules/payments/PaymentsValidators.cpp

Issue 2020913002: PaymentRequest: Rename ShippingAddress to PaymentAddress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/payments/PaymentsValidators.h" 5 #include "modules/payments/PaymentsValidators.h"
6 6
7 #include "bindings/core/v8/ScriptRegexp.h" 7 #include "bindings/core/v8/ScriptRegexp.h"
8 #include "wtf/text/StringImpl.h" 8 #include "wtf/text/StringImpl.h"
9 9
10 namespace blink { 10 namespace blink {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 { 57 {
58 if (ScriptRegexp("^([A-Z][a-z]{3})?$", TextCaseSensitive).match(code) == 0) 58 if (ScriptRegexp("^([A-Z][a-z]{3})?$", TextCaseSensitive).match(code) == 0)
59 return true; 59 return true;
60 60
61 if (optionalErrorMessage) 61 if (optionalErrorMessage)
62 *optionalErrorMessage = "'" + code + "' is not a valid ISO 15924 script code, should be an upper case letter [A-Z] followed by 3 lower case letters [a-z ]"; 62 *optionalErrorMessage = "'" + code + "' is not a valid ISO 15924 script code, should be an upper case letter [A-Z] followed by 3 lower case letters [a-z ]";
63 63
64 return false; 64 return false;
65 } 65 }
66 66
67 bool PaymentsValidators::isValidShippingAddress(const mojom::blink::ShippingAddr essPtr& address, String* optionalErrorMessage) 67 bool PaymentsValidators::isValidShippingAddress(const mojom::blink::PaymentAddre ssPtr& address, String* optionalErrorMessage)
68 { 68 {
69 if (!isValidRegionCodeFormat(address->region_code, optionalErrorMessage)) 69 if (!isValidRegionCodeFormat(address->region_code, optionalErrorMessage))
70 return false; 70 return false;
71 71
72 if (!isValidLanguageCodeFormat(address->language_code, optionalErrorMessage) ) 72 if (!isValidLanguageCodeFormat(address->language_code, optionalErrorMessage) )
73 return false; 73 return false;
74 74
75 if (!isValidScriptCodeFormat(address->script_code, optionalErrorMessage)) 75 if (!isValidScriptCodeFormat(address->script_code, optionalErrorMessage))
76 return false; 76 return false;
77 77
78 if (address->language_code.isEmpty() && !address->script_code.isEmpty()) { 78 if (address->language_code.isEmpty() && !address->script_code.isEmpty()) {
79 if (optionalErrorMessage) 79 if (optionalErrorMessage)
80 *optionalErrorMessage = "If language code is empty, then script code should also be empty"; 80 *optionalErrorMessage = "If language code is empty, then script code should also be empty";
81 81
82 return false; 82 return false;
83 } 83 }
84 84
85 return true; 85 return true;
86 } 86 }
87 87
88 } // namespace blink 88 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698