PaymentRequest: Make the PaymentResponse interface serializable.

third_party/WebKit/Source/modules/payments/PaymentResponse.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/PaymentResponse.h"
 
+#include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
+#include "bindings/core/v8/V8ObjectBuilder.h"
 #include "modules/payments/PaymentAddress.h"
 #include "modules/payments/PaymentCompleter.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 PaymentResponse::PaymentResponse(mojom::blink::PaymentResponsePtr response, PaymentCompleter* paymentCompleter)
     : m_methodName(response->method_name)
     , m_stringifiedDetails(response->stringified_details)
     , m_shippingAddress(response->shipping_address ? new PaymentAddress(std::move(response->shipping_address)) : nullptr)
     , m_shippingOption(response->shipping_option)
     , m_payerName(response->payer_name)
     , m_payerEmail(response->payer_email)
     , m_payerPhone(response->payer_phone)
     , m_paymentCompleter(paymentCompleter)
 {
     DCHECK(m_paymentCompleter);
 }
 
 PaymentResponse::~PaymentResponse()
 {
 }
 
+ScriptValue PaymentResponse::toJSONForBinding(ScriptState* scriptState) const
+{
+    V8ObjectBuilder result(scriptState);
+    result.addString("methodName", methodName());
+    result.add("details", details(scriptState, ASSERT_NO_EXCEPTION));
+
+    if (shippingAddress())
+        result.add("shippingAddress", shippingAddress()->toJSONForBinding(scriptState));
+    else
+        result.addNull("shippingAddress");

[please use gerrit instead, 2016/09/20 08:15:46]

Do we need to add null shippingAddress, shippingOption, payerEmail, and
payerPhone? I would prefer omitting them instead.

[zino, 2016/09/20 16:55:43]

I'm not sure but we can not omit them even if the value is null.
The attributes you mentioned are nullable types. So, they can be null.

According to the WebIDL spec, the null value is defined as serialized value.
 - https://www.w3.org/TR/WebIDL-1/#dfn-serialized-value
 - https://www.w3.org/TR/WebIDL-1/#dfn-convert-to-serialized-value

The following link is an existing another example in Chromium.
 -
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/modules/peerco...

+
+    if (shippingOption().isNull())
+        result.addNull("shippingOption");
+    else
+        result.addString("shippingOption", shippingOption());
+
+    if (payerEmail().isNull())
+        result.addNull("payerEmail");
+    else
+        result.addString("payerEmail", payerEmail());
+
+    if (payerPhone().isNull())
+        result.addNull("payerPhone");
+    else
+        result.addString("payerPhone", payerPhone());
+
+    return result.scriptValue();
+}
+
 ScriptValue PaymentResponse::details(ScriptState* scriptState, ExceptionState& exceptionState) const
 {
     return ScriptValue(scriptState, fromJSONString(scriptState, m_stringifiedDetails, exceptionState));
 }
 
 ScriptPromise PaymentResponse::complete(ScriptState* scriptState, const String& result)
 {
     PaymentCompleter::PaymentComplete convertedResult = PaymentCompleter::Unknown;
     if (result == "success")
         convertedResult = PaymentCompleter::Success;
     else if (result == "fail")
         convertedResult = PaymentCompleter::Fail;
     return m_paymentCompleter->complete(scriptState, convertedResult);
 }
 
 DEFINE_TRACE(PaymentResponse)
 {
     visitor->trace(m_shippingAddress);
     visitor->trace(m_paymentCompleter);
 }
 
 } // namespace blink