<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196995] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196995">196995</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-23 14:08:09 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaCodingmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196994 => 196995)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-02-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ 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 <andersca@apple.com>
+
</ins><span class="cx"> Fix iOS build.
</span><span class="cx">
</span><span class="cx"> * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (196994 => 196995)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> IndexedDB databases, and local storage.
</span><span class="cx"> */
</span><span class="cx"> WK_CLASS_AVAILABLE(10_11, 9_0)
</span><del>-@interface WKWebsiteDataStore : NSObject
</del><ins>+@interface WKWebsiteDataStore : NSObject <NSCoding>
</ins><span class="cx">
</span><span class="cx"> /* @abstract Returns the default data store. */
</span><span class="cx"> + (WKWebsiteDataStore *)defaultDataStore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (196994 => 196995)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -51,6 +51,32 @@
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (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);
+}
+
</ins><span class="cx"> - (BOOL)isPersistent
</span><span class="cx"> {
</span><span class="cx"> return _websiteDataStore->isPersistent();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (196994 => 196995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-23 21:49:47 UTC (rev 196994)
+++ trunk/Tools/ChangeLog 2016-02-23 22:08:09 UTC (rev 196995)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-02-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ 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 <andersca@apple.com>
+
</ins><span class="cx"> WKWebViewConfiguration should conform to NSCoding
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154602
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaCodingmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm (196994 => 196995)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -65,6 +65,18 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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]);
+}
+
</ins><span class="cx"> TEST(Coding, WKWebViewConfiguration)
</span><span class="cx"> {
</span><span class="cx"> auto a = adoptNS([[WKWebViewConfiguration alloc] init]);
</span></span></pre>
</div>
</div>
</body>
</html>