Title: [197000] trunk/Source/WebKit2
- Revision
- 197000
- Author
- [email protected]
- Date
- 2016-02-23 14:54:04 -0800 (Tue, 23 Feb 2016)
Log Message
WKUserContentController should conform to NSCoding
https://bugs.webkit.org/show_bug.cgi?id=154609
Reviewed by Sam Weinig.
Since we just want to be able to encode WKUserContentController from WKWebViewConfiguration,
we don't encode anything inside WKUserContentController.
* UIProcess/API/Cocoa/WKUserContentController.h:
* UIProcess/API/Cocoa/WKUserContentController.mm:
(-[WKUserContentController encodeWithCoder:]):
(-[WKUserContentController initWithCoder:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (196999 => 197000)
--- trunk/Source/WebKit2/ChangeLog 2016-02-23 22:41:26 UTC (rev 196999)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-23 22:54:04 UTC (rev 197000)
@@ -1,5 +1,20 @@
2016-02-23 Anders Carlsson <[email protected]>
+ WKUserContentController should conform to NSCoding
+ https://bugs.webkit.org/show_bug.cgi?id=154609
+
+ Reviewed by Sam Weinig.
+
+ Since we just want to be able to encode WKUserContentController from WKWebViewConfiguration,
+ we don't encode anything inside WKUserContentController.
+
+ * UIProcess/API/Cocoa/WKUserContentController.h:
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ (-[WKUserContentController encodeWithCoder:]):
+ (-[WKUserContentController initWithCoder:]):
+
+2016-02-23 Anders Carlsson <[email protected]>
+
WKProcessPool should conform to NSCoding
https://bugs.webkit.org/show_bug.cgi?id=154608
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h (196999 => 197000)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2016-02-23 22:41:26 UTC (rev 196999)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2016-02-23 22:54:04 UTC (rev 197000)
@@ -40,7 +40,7 @@
web view configuration.
*/
WK_CLASS_AVAILABLE(10_10, 8_0)
-@interface WKUserContentController : NSObject
+@interface WKUserContentController : NSObject <NSCoding>
/*! @abstract The user scripts associated with this user content
controller.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (196999 => 197000)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2016-02-23 22:41:26 UTC (rev 196999)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2016-02-23 22:54:04 UTC (rev 197000)
@@ -62,6 +62,18 @@
[super dealloc];
}
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+ if (!(self = [super init]))
+ return nil;
+
+ return self;
+}
+
- (NSArray *)userScripts
{
return wrapper(_userContentControllerProxy->userScripts());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
