Changeset 242930 in webkit

Timestamp:

Mar 13, 2019 6:40:05 PM (5 years ago)

Author:

timothy@apple.com

Message:

REGRESSION (r242908): 'NSInvalidArgumentException', reason: '+[PKPaymentMerchantSession count]: unrecognized selector sent to class 0x1c0fae060'
​https://bugs.webkit.org/show_bug.cgi?id=195720

Reviewed by Andy Estes.

Add back decode(Decoder& decoder, Class allowedClass) for Apple Pay code.

• Shared/Cocoa/ArgumentCodersCocoa.h:

(IPC::decode): Added.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/Cocoa/ArgumentCodersCocoa.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-13  Timothy Hatcher  <timothy@apple.com>
+
+        REGRESSION (r242908):  'NSInvalidArgumentException', reason: '+[PKPaymentMerchantSession count]: unrecognized selector sent to class 0x1c0fae060'
+        https://bugs.webkit.org/show_bug.cgi?id=195720
+
+        Reviewed by Andy Estes.
+
+        Add back decode(Decoder& decoder, Class allowedClass) for Apple Pay code.
+
+        * Shared/Cocoa/ArgumentCodersCocoa.h:
+        (IPC::decode): Added.
+
 2019-03-13  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.h

@@ -40 +40 @@
 template<typename T, typename = IsObjCObject<T>> bool decode(Decoder&, RetainPtr<T>&, NSArray<Class> *allowedClasses = @[ [T class] ]);
 template<typename T, typename = IsObjCObject<T>> Optional<RetainPtr<T>> decode(Decoder&, NSArray<Class> *allowedClasses = @[ [T class] ]);
+template<typename T, typename = IsObjCObject<T>> Optional<RetainPtr<T>> decode(Decoder&, Class allowedClass);
 
 #ifndef NDEBUG
@@ -81 +82 @@
 }
 
+template<typename T, typename>
+Optional<RetainPtr<T>> decode(Decoder& decoder, Class allowedClass)
+{
+    return decode<T>(decoder, @[ allowedClass ]);
+}
+
 template<typename T> struct ArgumentCoder<T *> {
     template<typename U = T, typename = IsObjCObject<U>>