PaymentRequest: Introduce PaymentMethodData.

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

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 3fa1bd13c75a25ff93609593dc0e1f2b8bc8f590..aa71424e99df236054a343b15ea2e87f6a77cf59 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,9 +38,8 @@ 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();
 
@@ -66,7 +66,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 +84,9 @@ private:
     // Clears the promise resolvers and closes the Mojo connection.
     void clearResolversAndCloseMojoConnection();
 
-    Vector<String> m_supportedMethods;
+    HeapVector<PaymentMethodData> m_methodData;

[please use gerrit instead, 2016/05/29 19:57:12]

mek@: Does storing PaymentMethodData (which includes a "data" object) on stack
like this pose any problems for garbage collection? We used to convert the 4th
optional parameter |data| from ScriptValue to String for this exact purpose.
Perhaps |m_methodData| should be a HeapVector<Method>, where Method is:

struct Method {
    HeapVector<String> names;
    String stringifiedData;
};

(Method may need to be garbage collected.)

[zino, 2016/06/01 17:43:46]

I found some existing cases.
 - NFCMessage (NFCRecord has ScriptValue.) [1]
 - InternalDictionary [2]

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/out/Debug/gen/blin...
[2]
https://code.google.com/p/chromium/codesearch#chromium/src/out/Debug/gen/blin...

But I'm not sure.

[Marijn Kruisselbrink, 2016/06/01 18:20:24]

The problem isn't so much that there are dictionary types with
object/ScriptValue members, but rather that references to those ScriptValues are
stored in other oilpan garbage collected objects. At least that's my
understanding of the potential issue. But I don't understand the exact issues
very well either. So probably it's best to just leave it like this for now and
double check with somebody from the bindings team (maybe haraken@) to see if
storing ScriptValue's like this is problematic or not.

     PaymentDetails m_details;
     PaymentOptions m_options;
-    String m_stringifiedData;
     Member<ShippingAddress> m_shippingAddress;
     String m_shippingOption;
     Member<ScriptPromiseResolver> m_showResolver;