<!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>[196997] 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/196997">196997</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-23 14:29:01 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKProcessPool should conform to NSCoding
https://bugs.webkit.org/show_bug.cgi?id=154608
Reviewed by Sam Weinig.
Source/WebKit2:
Add +[WKProcessPool _sharedProcessPool] and encode/decode whether the process pool is shared.
* UIProcess/API/Cocoa/WKProcessPool.h:
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool encodeWithCoder:]):
(-[WKProcessPool initWithCoder:]):
(+[WKProcessPool _sharedProcessPool]):
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
Tools:
Add tests.
* 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="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h</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 (196996 => 196997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-23 22:17:24 UTC (rev 196996)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-23 22:29:01 UTC (rev 196997)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-02-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ WKProcessPool should conform to NSCoding
+ https://bugs.webkit.org/show_bug.cgi?id=154608
+
+ Reviewed by Sam Weinig.
+
+ Add +[WKProcessPool _sharedProcessPool] and encode/decode whether the process pool is shared.
+
+ * UIProcess/API/Cocoa/WKProcessPool.h:
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool encodeWithCoder:]):
+ (-[WKProcessPool initWithCoder:]):
+ (+[WKProcessPool _sharedProcessPool]):
+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+
+2016-02-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WKWebsiteDataStore should conform to NSCoding
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154605
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h (196996 => 196997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h 2016-02-23 22:17:24 UTC (rev 196996)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h 2016-02-23 22:29:01 UTC (rev 196997)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> with the same process pool end up sharing web content processes.
</span><span class="cx"> */
</span><span class="cx"> WK_CLASS_AVAILABLE(10_10, 8_0)
</span><del>-@interface WKProcessPool : NSObject
</del><ins>+@interface WKProcessPool : NSObject <NSCoding>
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (196996 => 196997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2016-02-23 22:17:24 UTC (rev 196996)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2016-02-23 22:29:01 UTC (rev 196997)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> #import "WKGeolocationProviderIOS.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static WKProcessPool *sharedProcessPool;
+
</ins><span class="cx"> @implementation WKProcessPool {
</span><span class="cx"> WebKit::WeakObjCPtr<id <_WKAutomationDelegate>> _automationDelegate;
</span><span class="cx"> WebKit::WeakObjCPtr<id <_WKDownloadDelegate>> _downloadDelegate;
</span><span class="lines">@@ -88,6 +90,28 @@
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)encodeWithCoder:(NSCoder *)coder
+{
+ if (self == sharedProcessPool) {
+ [coder encodeBool:YES forKey:@"isSharedProcessPool"];
+ return;
+ }
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+ if (!(self = [self init]))
+ return nil;
+
+ if ([coder decodeBoolForKey:@"isSharedProcessPool"]) {
+ [self release];
+
+ return [[WKProcessPool _sharedProcessPool] retain];
+ }
+
+ return self;
+}
+
</ins><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><span class="cx"> return [NSString stringWithFormat:@"<%@: %p; configuration = %@>", NSStringFromClass(self.class), self, wrapper(_processPool->configuration())];
</span><span class="lines">@@ -116,6 +140,16 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKProcessPool (WKPrivate)
</span><span class="cx">
</span><ins>++ (WKProcessPool *)_sharedProcessPool
+{
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ sharedProcessPool = [[WKProcessPool alloc] init];
+ });
+
+ return sharedProcessPool;
+}
+
</ins><span class="cx"> + (NSURL *)_websiteDataURLForContainerWithURL:(NSURL *)containerURL
</span><span class="cx"> {
</span><span class="cx"> return [WKProcessPool _websiteDataURLForContainerWithURL:containerURL bundleIdentifierIfNotInContainer:nil];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (196996 => 196997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2016-02-23 22:17:24 UTC (rev 196996)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2016-02-23 22:29:01 UTC (rev 196997)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx">
</span><span class="cx"> @interface WKProcessPool (WKPrivate)
</span><span class="cx">
</span><ins>++ (WKProcessPool *)_sharedProcessPool;
+
</ins><span class="cx"> @property (nonatomic, readonly) _WKProcessPoolConfiguration *_configuration;
</span><span class="cx">
</span><span class="cx"> - (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (196996 => 196997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-23 22:17:24 UTC (rev 196996)
+++ trunk/Tools/ChangeLog 2016-02-23 22:29:01 UTC (rev 196997)
</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>+ WKProcessPool should conform to NSCoding
+ https://bugs.webkit.org/show_bug.cgi?id=154608
+
+ Reviewed by Sam Weinig.
+
+ Add tests.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm:
+ (TEST):
+
+2016-02-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WKWebsiteDataStore should conform to NSCoding
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154605
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaCodingmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm (196996 => 196997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm 2016-02-23 22:17:24 UTC (rev 196996)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm 2016-02-23 22:29:01 UTC (rev 196997)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit/WKPreferences.h>
</del><ins>+#import <WebKit/WKProcessPoolPrivate.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> template<typename T>
</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, WKProcessPool_Shared)
+{
+ auto a = encodeAndDecode([WKProcessPool _sharedProcessPool]);
+ EXPECT_EQ([WKProcessPool _sharedProcessPool], a.get());
+}
+
+TEST(Coding, WKProcessPool)
+{
+ auto a = encodeAndDecode(adoptNS([[WKProcessPool alloc] init]).get());
+ EXPECT_NE([WKProcessPool _sharedProcessPool], a.get());
+}
+
</ins><span class="cx"> TEST(Coding, WKWebsiteDataStore_Default)
</span><span class="cx"> {
</span><span class="cx"> auto a = encodeAndDecode([WKWebsiteDataStore defaultDataStore]);
</span></span></pre>
</div>
</div>
</body>
</html>