Parsing new Android Pay Payment Request API member: minGooglePlayServicesVersion

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 d92af7b33783dddc8ff6789844c0deba7c88adf3..dc7a802aa404e9f49917eb1495418640ff673c2f 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
@@ -35,6 +35,7 @@
 #include "public/platform/Platform.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/HashSet.h"
+#include "wtf/text/WTFString.h"

[please use gerrit instead, 2016/12/19 21:47:38]

Already included in PaymnentRequest.h, so no need for it in PaymentRequest.cpp.

[Walter Cacau, 2016/12/19 22:16:54]

Done.

 #include <stddef.h>
 #include <utility>
 
@@ -253,6 +254,15 @@ void maybeSetAndroidPayMethodData(const ScriptValue& input,
   output->merchant_name = androidPay.merchantName();
   output->merchant_id = androidPay.merchantId();
 

[please use gerrit instead, 2016/12/19 21:47:38]

You should initialize output->min_google_play_services_version to an explicit
value that means "merchant did not specify" or "does not matter to this
merchant", such as 0. Then add a comment in payment_request.mojom that 0 means
unspecified.

If you follow my advice about making this a long in the WebIDL file, then you
can use a single statement here:

output->min_google_play_services_version =
androidPay.hasMinGooglePlayServicesVersion() ?
androidPay.minGooglePlayServicesVersion() : 0;

[Walter Cacau, 2016/12/19 22:16:54]

Done.

+  if (androidPay.hasMinGooglePlayServicesVersion()) {
+    bool ok = false;
+    int minGooglePlayServicesVersion =
+        androidPay.minGooglePlayServicesVersion().toIntStrict(&ok);
+    if (ok) {
+      output->min_google_play_services_version = minGooglePlayServicesVersion;
+    }
+  }
+
   if (androidPay.hasAllowedCardNetworks()) {
     for (const String& allowedCardNetwork : androidPay.allowedCardNetworks()) {
       for (size_t i = 0; i < arraysize(kAndroidPayNetwork); ++i) {