<!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>[169271] trunk/Source/WebKit2</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/169271">169271</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-23 11:59:56 -0700 (Fri, 23 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use a per app directory structure for website data
https://bugs.webkit.org/show_bug.cgi?id=133125
&lt;rdar://problem/16830143&gt;

Reviewed by Dan Bernstein, Sam Weinig and Tim Horton.

Put website data in subdirectories of ~/Library/WebKit/&lt;bundle ID&gt;/WebsiteData.
We use &quot;LocalStorage&quot;, &quot;WebSQL&quot;, and &quot;IndexedDB&quot; subdirectories.

* UIProcess/API/Cocoa/WKProcessPool.mm:
(websiteDataDirectoryURL):
(-[WKProcessPool _initWithConfiguration:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169270 => 169271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-05-23 18:36:55 UTC (rev 169270)
+++ trunk/Source/WebKit2/ChangeLog        2014-05-23 18:59:56 UTC (rev 169271)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-20  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Use a per app directory structure for website data
+        https://bugs.webkit.org/show_bug.cgi?id=133125
+        &lt;rdar://problem/16830143&gt;
+
+        Reviewed by Dan Bernstein, Sam Weinig and Tim Horton.
+
+        Put website data in subdirectories of ~/Library/WebKit/&lt;bundle ID&gt;/WebsiteData.
+        We use &quot;LocalStorage&quot;, &quot;WebSQL&quot;, and &quot;IndexedDB&quot; subdirectories.
+
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (websiteDataDirectoryURL):
+        (-[WKProcessPool _initWithConfiguration:]):
+
</ins><span class="cx"> 2014-05-23  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] WKNavigationResponsePrivate.h is internal
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (169270 => 169271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm        2014-05-23 18:36:55 UTC (rev 169270)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm        2014-05-23 18:59:56 UTC (rev 169271)
</span><span class="lines">@@ -104,6 +104,29 @@
</span><span class="cx"> 
</span><span class="cx"> @implementation WKProcessPool (WKPrivate)
</span><span class="cx"> 
</span><ins>+static NSURL *websiteDataDirectoryURL(NSString *directoryName)
+{
+    static dispatch_once_t onceToken;
+    static NSURL *websiteDataURL;
+
+    dispatch_once(&amp;onceToken, ^{
+        NSURL *url = [[NSFileManager defaultManager] URLForDirectory:NSLibraryDirectory inDomain:NSUserDomainMask appropriateForURL:nullptr create:NO error:nullptr];
+        if (!url)
+            RELEASE_ASSERT_NOT_REACHED();
+
+        url = [url URLByAppendingPathComponent:@&quot;WebKit&quot; isDirectory:YES];
+        url = [url URLByAppendingPathComponent:[[NSBundle mainBundle] bundleIdentifier] isDirectory:YES];
+
+        websiteDataURL = [[url URLByAppendingPathComponent:@&quot;WebsiteData&quot; isDirectory:YES] retain];
+    });
+
+    NSURL *url = [websiteDataURL URLByAppendingPathComponent:directoryName isDirectory:YES];
+    if (![[NSFileManager defaultManager] createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:nullptr])
+        LOG_ERROR(&quot;Failed to create directory %@&quot;, url);
+
+    return url;
+}
+
</ins><span class="cx"> - (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration
</span><span class="cx"> {
</span><span class="cx">     if (!(self = [super init]))
</span><span class="lines">@@ -125,8 +148,9 @@
</span><span class="cx">         webContextConfiguration.injectedBundlePath = bundleURL.path;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // FIXME: These are legacy configuration defaults and should not be applied when creating a WKProcessPool.
-    WebKit::WebContext::applyPlatformSpecificConfigurationDefaults(webContextConfiguration);
</del><ins>+    webContextConfiguration.localStorageDirectory = websiteDataDirectoryURL(@&quot;LocalStorage&quot;).absoluteString.fileSystemRepresentation;
+    webContextConfiguration.webSQLDatabaseDirectory = websiteDataDirectoryURL(@&quot;WebSQL&quot;).absoluteString.fileSystemRepresentation;
+    webContextConfiguration.indexedDBDatabaseDirectory = websiteDataDirectoryURL(@&quot;IndexedDB&quot;).absoluteString.fileSystemRepresentation;
</ins><span class="cx"> 
</span><span class="cx">     API::Object::constructInWrapper&lt;WebKit::WebContext&gt;(self, std::move(webContextConfiguration));
</span><span class="cx">     _context-&gt;setHistoryClient(std::make_unique&lt;WebKit::HistoryClient&gt;());
</span></span></pre>
</div>
</div>

</body>
</html>