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

Unified Diff: third_party/WebKit/Source/modules/payments/PaymentRequest.h

Issue 2020883002: PaymentRequest: Introduce PaymentMethodData. (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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/payments/PaymentRequest.h
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.h b/third_party/WebKit/Source/modules/payments/PaymentRequest.h
index deb3564c25b3aa650cb48216838ad067770ab067..e137860ee057e625f9d1355111648c6a1aaae267 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.h
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.h
@@ -13,6 +13,7 @@
#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"
@@ -37,12 +38,18 @@ class MODULES_EXPORT PaymentRequest final : public EventTargetWithInlineData, WT
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&);
@@ -66,7 +73,7 @@ public:
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;
@@ -84,10 +91,9 @@ private:
// 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;

Powered by Google App Engine
This is Rietveld 408576698