Title: [196995] trunk
- Revision
- 196995
- Author
- [email protected]
- Date
- 2016-02-23 14:08:09 -0800 (Tue, 23 Feb 2016)
Log Message
WKWebsiteDataStore should conform to NSCoding
https://bugs.webkit.org/show_bug.cgi?id=154605
Reviewed by Dan Bernstein.
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebsiteDataStore.h:
* UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
(-[WKWebsiteDataStore initWithCoder:]):
(-[WKWebsiteDataStore encodeWithCoder:]):
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm:
(TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (196994 => 196995)
--- trunk/Source/WebKit2/ChangeLog 2016-02-23 21:49:47 UTC (rev 196994)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-23 22:08:09 UTC (rev 196995)
@@ -1,5 +1,17 @@
2016-02-23 Anders Carlsson <[email protected]>
+ WKWebsiteDataStore should conform to NSCoding
+ https://bugs.webkit.org/show_bug.cgi?id=154605
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore initWithCoder:]):
+ (-[WKWebsiteDataStore encodeWithCoder:]):
+
+2016-02-23 Anders Carlsson <[email protected]>
+
Fix iOS build.
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (196994 => 196995)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2016-02-23 21:49:47 UTC (rev 196994)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2016-02-23 22:08:09 UTC (rev 196995)
@@ -36,7 +36,7 @@
IndexedDB databases, and local storage.
*/
WK_CLASS_AVAILABLE(10_11, 9_0)
-@interface WKWebsiteDataStore : NSObject
+@interface WKWebsiteDataStore : NSObject <NSCoding>
/* @abstract Returns the default data store. */
+ (WKWebsiteDataStore *)defaultDataStore;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (196994 => 196995)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2016-02-23 21:49:47 UTC (rev 196994)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2016-02-23 22:08:09 UTC (rev 196995)
@@ -51,6 +51,32 @@
[super dealloc];
}
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+ if (!(self = [super init]))
+ return nil;
+
+ RetainPtr<WKWebsiteDataStore> dataStore;
+ if ([coder decodeBoolForKey:@"isDefaultDataStore"])
+ dataStore = [WKWebsiteDataStore defaultDataStore];
+ else
+ dataStore = [WKWebsiteDataStore nonPersistentDataStore];
+
+ [self release];
+
+ return dataStore.leakRef();
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+ if (self == [WKWebsiteDataStore defaultDataStore]) {
+ [coder encodeBool:YES forKey:@"isDefaultDataStore"];
+ return;
+ }
+
+ ASSERT(!self.persistent);
+}
+
- (BOOL)isPersistent
{
return _websiteDataStore->isPersistent();
Modified: trunk/Tools/ChangeLog (196994 => 196995)
--- trunk/Tools/ChangeLog 2016-02-23 21:49:47 UTC (rev 196994)
+++ trunk/Tools/ChangeLog 2016-02-23 22:08:09 UTC (rev 196995)
@@ -1,5 +1,15 @@
2016-02-23 Anders Carlsson <[email protected]>
+ WKWebsiteDataStore should conform to NSCoding
+ https://bugs.webkit.org/show_bug.cgi?id=154605
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm:
+ (TEST):
+
+2016-02-23 Anders Carlsson <[email protected]>
+
WKWebViewConfiguration should conform to NSCoding
https://bugs.webkit.org/show_bug.cgi?id=154602
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm (196994 => 196995)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm 2016-02-23 21:49:47 UTC (rev 196994)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm 2016-02-23 22:08:09 UTC (rev 196995)
@@ -65,6 +65,18 @@
#endif
}
+TEST(Coding, WKWebsiteDataStore_Default)
+{
+ auto a = encodeAndDecode([WKWebsiteDataStore defaultDataStore]);
+ EXPECT_EQ([WKWebsiteDataStore defaultDataStore], a.get());
+}
+
+TEST(Coding, WKWebsiteDataStore_NonPersistent)
+{
+ auto a = encodeAndDecode([WKWebsiteDataStore nonPersistentDataStore]);
+ EXPECT_FALSE([a isPersistent]);
+}
+
TEST(Coding, WKWebViewConfiguration)
{
auto a = adoptNS([[WKWebViewConfiguration alloc] init]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
