<!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>[170084] 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/170084">170084</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-17 16:36:45 -0700 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose the location of website data
https://bugs.webkit.org/show_bug.cgi?id=134000
<rdar://problem/17350498>
Reviewed by Dan Bernstein.
Also, remove the bundle ID from the website data path for containerized apps.
* Shared/mac/SandboxUtilities.cpp:
(WebKit::processIsAppSandboxed):
* Shared/mac/SandboxUtilities.h:
* UIProcess/API/Cocoa/WKProcessPool.mm:
(+[WKProcessPool _websiteDataURLForContainerWithURL:]):
(websiteDataDirectoryURL):
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSandboxUtilitiescpp">trunk/Source/WebKit2/Shared/mac/SandboxUtilities.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSandboxUtilitiesh">trunk/Source/WebKit2/Shared/mac/SandboxUtilities.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170083 => 170084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-17 23:33:16 UTC (rev 170083)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-17 23:36:45 UTC (rev 170084)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-06-17 Anders Carlsson <andersca@apple.com>
+
+ Expose the location of website data
+ https://bugs.webkit.org/show_bug.cgi?id=134000
+ <rdar://problem/17350498>
+
+ Reviewed by Dan Bernstein.
+
+ Also, remove the bundle ID from the website data path for containerized apps.
+
+ * Shared/mac/SandboxUtilities.cpp:
+ (WebKit::processIsAppSandboxed):
+ * Shared/mac/SandboxUtilities.h:
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (+[WKProcessPool _websiteDataURLForContainerWithURL:]):
+ (websiteDataDirectoryURL):
+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+
</ins><span class="cx"> 2014-06-17 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve enter and exit fullscreen transition by using two step transition.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSandboxUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SandboxUtilities.cpp (170083 => 170084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SandboxUtilities.cpp 2014-06-17 23:33:16 UTC (rev 170083)
+++ trunk/Source/WebKit2/Shared/mac/SandboxUtilities.cpp 2014-06-17 23:36:45 UTC (rev 170084)
</span><span class="lines">@@ -26,14 +26,18 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SandboxUtilities.h"
</span><span class="cx">
</span><ins>+#include <array>
+
</ins><span class="cx"> #if __has_include(<sandbox/private.h>)
</span><span class="cx"> #import <sandbox/private.h>
</span><span class="cx"> #else
</span><span class="cx"> enum sandbox_filter_type {
</span><span class="cx"> SANDBOX_FILTER_NONE,
</span><span class="cx"> };
</span><del>-extern "C"
</del><ins>+extern "C" {
</ins><span class="cx"> int sandbox_check(pid_t, const char *operation, enum sandbox_filter_type, ...);
</span><ins>+int sandbox_container_path_for_pid(pid_t, char *buffer, size_t bufsize);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -43,4 +47,24 @@
</span><span class="cx"> return sandbox_check(pid, nullptr, SANDBOX_FILTER_NONE);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool processHasContainer(pid_t pid)
+{
+ std::array<char, MAXPATHLEN> path;
+
+ if (sandbox_container_path_for_pid(pid, path.data(), path.size()))
+ return false;
+
+ if (!path[0])
+ return false;
+
+ return true;
</ins><span class="cx"> }
</span><ins>+
+bool processHasContainer()
+{
+ static bool hasContainer = processHasContainer(getpid());
+
+ return hasContainer;
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSandboxUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SandboxUtilities.h (170083 => 170084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SandboxUtilities.h 2014-06-17 23:33:16 UTC (rev 170083)
+++ trunk/Source/WebKit2/Shared/mac/SandboxUtilities.h 2014-06-17 23:36:45 UTC (rev 170084)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> bool processIsSandboxed(pid_t);
</span><ins>+bool processHasContainer();
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (170083 => 170084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-06-17 23:33:16 UTC (rev 170083)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-06-17 23:36:45 UTC (rev 170084)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "DownloadClient.h"
</span><span class="cx"> #import "HistoryClient.h"
</span><span class="cx"> #import "ProcessModel.h"
</span><ins>+#import "SandboxUtilities.h"
</ins><span class="cx"> #import "WKObject.h"
</span><span class="cx"> #import "WeakObjCPtr.h"
</span><span class="cx"> #import "WebCertificateInfo.h"
</span><span class="lines">@@ -104,6 +105,13 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKProcessPool (WKPrivate)
</span><span class="cx">
</span><ins>++ (NSURL *)_websiteDataURLForContainerWithURL:(NSURL *)containerURL
+{
+ NSURL *url = [containerURL URLByAppendingPathComponent:@"Library" isDirectory:YES];
+ url = [url URLByAppendingPathComponent:@"WebKit" isDirectory:YES];
+ return [url URLByAppendingPathComponent:@"WebsiteData" isDirectory:YES];
+}
+
</ins><span class="cx"> static NSURL *websiteDataDirectoryURL(NSString *directoryName)
</span><span class="cx"> {
</span><span class="cx"> static dispatch_once_t onceToken;
</span><span class="lines">@@ -116,12 +124,13 @@
</span><span class="cx">
</span><span class="cx"> url = [url URLByAppendingPathComponent:@"WebKit" isDirectory:YES];
</span><span class="cx">
</span><del>- NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
- if (!bundleIdentifier)
- bundleIdentifier = [NSProcessInfo processInfo].processName;
</del><ins>+ if (!WebKit::processHasContainer()) {
+ NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
+ if (!bundleIdentifier)
+ bundleIdentifier = [NSProcessInfo processInfo].processName;
+ url = [url URLByAppendingPathComponent:bundleIdentifier isDirectory:YES];
+ }
</ins><span class="cx">
</span><del>- url = [url URLByAppendingPathComponent:bundleIdentifier isDirectory:YES];
-
</del><span class="cx"> websiteDataURL = [[url URLByAppendingPathComponent:@"WebsiteData" isDirectory:YES] retain];
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (170083 => 170084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-06-17 23:33:16 UTC (rev 170083)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-06-17 23:36:45 UTC (rev 170084)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, weak, setter=_setDownloadDelegate:) id <_WKDownloadDelegate> _downloadDelegate;
</span><span class="cx">
</span><ins>++ (NSURL *)_websiteDataURLForContainerWithURL:(NSURL *)containerURL;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>