PaymentRequest: Introduce PaymentMethodData.

third_party/WebKit/Source/modules/payments/PaymentRequest.h

 // 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.
 
 #ifndef PaymentRequest_h
 #define PaymentRequest_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/events/EventTarget.h"
 #include "modules/ModulesExport.h"
 #include "modules/payments/PaymentCompleter.h"
 #include "modules/payments/PaymentDetails.h"
+#include "modules/payments/PaymentMethodData.h"
 #include "modules/payments/PaymentOptions.h"
 #include "modules/payments/PaymentUpdater.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/modules/payments/payment_request.mojom-blink.h"
 #include "wtf/Compiler.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class ExceptionState;
 class PaymentAddress;
 class ScriptPromiseResolver;
 class ScriptState;
 
 class MODULES_EXPORT PaymentRequest final : public EventTargetWithInlineData, WTF_NON_EXPORTED_BASE(public mojom::blink::PaymentRequestClient), public PaymentCompleter, public PaymentUpdater, public ContextLifecycleObserver, public ActiveScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
     USING_GARBAGE_COLLECTED_MIXIN(PaymentRequest)
     WTF_MAKE_NONCOPYABLE(PaymentRequest);
 
 public:
-    static PaymentRequest* create(ScriptState*, const Vector<String>& supportedMethods, const PaymentDetails&, ExceptionState&);
-    static PaymentRequest* create(ScriptState*, const Vector<String>& supportedMethods, const PaymentDetails&, const PaymentOptions&, ExceptionState&);
-    static PaymentRequest* create(ScriptState*, const Vector<String>& supportedMethods, const PaymentDetails&, const PaymentOptions&, const ScriptValue& data, ExceptionState&);
+    static PaymentRequest* create(ScriptState*, const HeapVector<PaymentMethodData>&, const PaymentDetails&, ExceptionState&);
+    static PaymentRequest* create(ScriptState*, const HeapVector<PaymentMethodData>&, const PaymentDetails&, const PaymentOptions&, ExceptionState&);
 
     virtual ~PaymentRequest();
 
+    struct MethodData {
+        MethodData(const Vector<String>& methods, const String& data)
+            : supportedMethods(methods), stringifiedData(data) {}
+        Vector<String> supportedMethods;
+        String stringifiedData;
+    };
+
     ScriptPromise show(ScriptState*);
     void abort(ExceptionState&);
 
     PaymentAddress* getShippingAddress() const { return m_shippingAddress.get(); }
     const String& shippingOption() const { return m_shippingOption; }
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(shippingaddresschange);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(shippingoptionchange);
 
     // EventTargetWithInlineData:
     const AtomicString& interfaceName() const override;
     ExecutionContext* getExecutionContext() const override;
 
     // PaymentCompleter:
     ScriptPromise complete(ScriptState*, bool success) override;
 
     // PaymentUpdater:
     void onUpdatePaymentDetails(const ScriptValue& detailsScriptValue) override;
     void onUpdatePaymentDetailsFailure(const ScriptValue& error) override;
 
     DECLARE_TRACE();
 
 private:
-    PaymentRequest(ScriptState*, const Vector<String>& supportedMethods, const PaymentDetails&, const PaymentOptions&, const ScriptValue& data, ExceptionState&);
+    PaymentRequest(ScriptState*, const HeapVector<PaymentMethodData>&, const PaymentDetails&, const PaymentOptions&, ExceptionState&);
 
     // LifecycleObserver:
     void contextDestroyed() override;
 
     // ActiveScriptWrappable:
     bool hasPendingActivity() const override;
 
     // mojom::blink::PaymentRequestClient:
     void OnShippingAddressChange(mojom::blink::PaymentAddressPtr) override;
     void OnShippingOptionChange(const String& shippingOptionId) override;
     void OnPaymentResponse(mojom::blink::PaymentResponsePtr) override;
     void OnError() override;
     void OnComplete() override;
 
     // Clears the promise resolvers and closes the Mojo connection.
     void clearResolversAndCloseMojoConnection();
 
-    Vector<String> m_supportedMethods;
+    Vector<MethodData> m_methodData;
     PaymentDetails m_details;
     PaymentOptions m_options;
-    String m_stringifiedData;
     Member<PaymentAddress> m_shippingAddress;
     String m_shippingOption;
     Member<ScriptPromiseResolver> m_showResolver;
     Member<ScriptPromiseResolver> m_completeResolver;
     mojom::blink::PaymentRequestPtr m_paymentProvider;
     mojo::Binding<mojom::blink::PaymentRequestClient> m_clientBinding;
 };
 
 } // namespace blink
 
 #endif // PaymentRequest_h