Title: [242930] trunk/Source/WebKit
- Revision
- 242930
- Author
- timo...@apple.com
- Date
- 2019-03-13 18:40:05 -0700 (Wed, 13 Mar 2019)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (242929 => 242930)
--- trunk/Source/WebKit/ChangeLog 2019-03-14 01:35:35 UTC (rev 242929)
+++ trunk/Source/WebKit/ChangeLog 2019-03-14 01:40:05 UTC (rev 242930)
@@ -1,3 +1,15 @@
+2019-03-13 Timothy Hatcher <timo...@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_hor...@apple.com>
Stop using some deprecated SPI in WKDrawingView
Modified: trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.h (242929 => 242930)
--- trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.h 2019-03-14 01:35:35 UTC (rev 242929)
+++ trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.h 2019-03-14 01:40:05 UTC (rev 242930)
@@ -39,6 +39,7 @@
template<typename T, typename = IsObjCObject<T>> void encode(Encoder&, T *);
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
@@ -80,6 +81,12 @@
return { *result };
}
+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>>
static void encode(Encoder& encoder, U *object)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
