Parsing new Android Pay Payment Request API member: minGooglePlayServicesVersion

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/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8StringResource.h"
@@ skipping 17 matching lines @@
 #include "modules/payments/PaymentShippingOption.h"
 #include "modules/payments/PaymentsValidators.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/wtf_array.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
 #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>
 
 using payments::mojom::blink::CanMakePaymentQueryResult;
 using payments::mojom::blink::PaymentAddressPtr;
 using payments::mojom::blink::PaymentCurrencyAmount;
 using payments::mojom::blink::PaymentCurrencyAmountPtr;
 using payments::mojom::blink::PaymentDetailsModifierPtr;
 using payments::mojom::blink::PaymentDetailsPtr;
 using payments::mojom::blink::PaymentErrorReason;
@@ skipping 197 matching lines @@
   V8AndroidPayMethodData::toImpl(input.isolate(), input.v8Value(), androidPay,
                                  dummyExceptionState);
   if (dummyExceptionState.hadException())
     return;
 
   if (androidPay.hasEnvironment() && androidPay.environment() == "TEST")
     output->environment = payments::mojom::blink::AndroidPayEnvironment::TEST;
 
   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) {
         if (allowedCardNetwork == kAndroidPayNetwork[i].name) {
           output->allowed_card_networks.append(kAndroidPayNetwork[i].code);
           break;
         }
       }
     }
   }
@@ skipping 645 matching lines @@
   m_completeResolver.clear();
   m_showResolver.clear();
   m_abortResolver.clear();
   m_canMakePaymentResolver.clear();
   if (m_clientBinding.is_bound())
     m_clientBinding.Close();
   m_paymentProvider.reset();
 }
 
 }  // namespace blink