<!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>[171536] branches/safari-600.1-branch/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/171536">171536</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 15:37:01 -0700 (Thu, 24 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171493">r171493</a>.  &lt;rdar://problem/17785560&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebKit2xcodeprojprojectpbxproj">branches/safari-600.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171535 => 171536)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog        2014-07-24 22:34:43 UTC (rev 171535)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog        2014-07-24 22:37:01 UTC (rev 171536)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-24  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r171493
+
+    2014-07-23  Oliver Hunt  &lt;oliver@apple.com&gt;
+
+            Add a pseudo target to create sandbox override roots
+            https://bugs.webkit.org/show_bug.cgi?id=135216
+            &lt;rdar://17785560&gt;
+
+            Reviewed by Alexey Proskuryakov.
+
+            Just a duplicate of the standard ios sandbox target, targetting
+            the profile overrides directory.  This means we can make roots
+            that &quot;Just Work&quot;.
+
+            * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-07-23  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merged r171490.  &lt;rdar://problem/17739108&gt;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (171535 => 171536)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2014-07-24 22:34:43 UTC (rev 171535)
+++ branches/safari-600.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2014-07-24 22:37:01 UTC (rev 171536)
</span><span class="lines">@@ -45,6 +45,17 @@
</span><span class="cx">                         name = WebKit2SandboxProfiles;
</span><span class="cx">                         productName = WebKit2SandboxProfiles;
</span><span class="cx">                 };
</span><ins>+                A7C0DC2D19804DEE00253CED /* WebKit2SandboxProfiles-IOSOverride */ = {
+                        isa = PBXAggregateTarget;
+                        buildConfigurationList = A7C0DC3219804DEE00253CED /* Build configuration list for PBXAggregateTarget &quot;WebKit2SandboxProfiles-IOSOverride&quot; */;
+                        buildPhases = (
+                                A7C0DC2E19804DEE00253CED /* CopyFiles */,
+                        );
+                        dependencies = (
+                        );
+                        name = &quot;WebKit2SandboxProfiles-IOSOverride&quot;;
+                        productName = WebKit2SandboxProfiles;
+                };
</ins><span class="cx">                 C0CE72851247E66800BC0EC4 /* Derived Sources */ = {
</span><span class="cx">                         isa = PBXAggregateTarget;
</span><span class="cx">                         buildConfigurationList = C0CE72891247E68600BC0EC4 /* Build configuration list for PBXAggregateTarget &quot;Derived Sources&quot; */;
</span><span class="lines">@@ -1112,6 +1123,9 @@
</span><span class="cx">                 A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Databases.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Databases.sb */; };
</span><span class="cx">                 A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */; };
</span><span class="cx">                 A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */; };
</span><ins>+                A7C0DC2F19804DEE00253CED /* com.apple.WebKit.Databases.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Databases.sb */; };
+                A7C0DC3019804DEE00253CED /* com.apple.WebKit.Networking.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */; };
+                A7C0DC3119804DEE00253CED /* com.apple.WebKit.WebContent.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */; };
</ins><span class="cx">                 A7D792D61767CB6E00881CBE /* ActivityAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */; };
</span><span class="cx">                 A7D792D81767CCA300881CBE /* ActivityAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D792D41767CB0900881CBE /* ActivityAssertion.h */; };
</span><span class="cx">                 A7E93CED1925331100A1DC48 /* ChildProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = A7E93CEB192531AA00A1DC48 /* ChildProcessIOS.mm */; };
</span><span class="lines">@@ -1957,6 +1971,18 @@
</span><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx">                 };
</span><ins>+                A7C0DC2E19804DEE00253CED /* CopyFiles */ = {
+                        isa = PBXCopyFilesBuildPhase;
+                        buildActionMask = 2147483647;
+                        dstPath = /usr/local/share/sandbox;
+                        dstSubfolderSpec = 0;
+                        files = (
+                                A7C0DC2F19804DEE00253CED /* com.apple.WebKit.Databases.sb in CopyFiles */,
+                                A7C0DC3019804DEE00253CED /* com.apple.WebKit.Networking.sb in CopyFiles */,
+                                A7C0DC3119804DEE00253CED /* com.apple.WebKit.WebContent.sb in CopyFiles */,
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                };
</ins><span class="cx">                 BCDE093C13272496001259FB /* Copy Plug-in Process Shim */ = {
</span><span class="cx">                         isa = PBXCopyFilesBuildPhase;
</span><span class="cx">                         buildActionMask = 2147483647;
</span><span class="lines">@@ -8221,6 +8247,7 @@
</span><span class="cx">                                 51F7DC3F180CC93600212CA3 /* Databases */,
</span><span class="cx">                                 5180C713180CCA3100FDA612 /* Databases.Development */,
</span><span class="cx">                                 A7AADA1019395CA9003EA1C7 /* WebKit2SandboxProfiles */,
</span><ins>+                                A7C0DC2D19804DEE00253CED /* WebKit2SandboxProfiles-IOSOverride */,
</ins><span class="cx">                         );
</span><span class="cx">                 };
</span><span class="cx"> /* End PBXProject section */
</span><span class="lines">@@ -9996,6 +10023,27 @@
</span><span class="cx">                         };
</span><span class="cx">                         name = Production;
</span><span class="cx">                 };
</span><ins>+                A7C0DC3319804DEE00253CED /* Debug */ = {
+                        isa = XCBuildConfiguration;
+                        buildSettings = {
+                                PRODUCT_NAME = &quot;WebKit2SandboxProfiles-IOSOverride&quot;;
+                        };
+                        name = Debug;
+                };
+                A7C0DC3419804DEE00253CED /* Release */ = {
+                        isa = XCBuildConfiguration;
+                        buildSettings = {
+                                PRODUCT_NAME = &quot;WebKit2SandboxProfiles-IOSOverride&quot;;
+                        };
+                        name = Release;
+                };
+                A7C0DC3519804DEE00253CED /* Production */ = {
+                        isa = XCBuildConfiguration;
+                        buildSettings = {
+                                PRODUCT_NAME = &quot;WebKit2SandboxProfiles-IOSOverride&quot;;
+                        };
+                        name = Production;
+                };
</ins><span class="cx">                 BC3DE47315A91764008D26FC /* Debug */ = {
</span><span class="cx">                         isa = XCBuildConfiguration;
</span><span class="cx">                         baseConfigurationReference = BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */;
</span><span class="lines">@@ -10340,6 +10388,16 @@
</span><span class="cx">                         defaultConfigurationIsVisible = 0;
</span><span class="cx">                         defaultConfigurationName = Production;
</span><span class="cx">                 };
</span><ins>+                A7C0DC3219804DEE00253CED /* Build configuration list for PBXAggregateTarget &quot;WebKit2SandboxProfiles-IOSOverride&quot; */ = {
+                        isa = XCConfigurationList;
+                        buildConfigurations = (
+                                A7C0DC3319804DEE00253CED /* Debug */,
+                                A7C0DC3419804DEE00253CED /* Release */,
+                                A7C0DC3519804DEE00253CED /* Production */,
+                        );
+                        defaultConfigurationIsVisible = 0;
+                        defaultConfigurationName = Production;
+                };
</ins><span class="cx">                 BC3DE47615A91764008D26FC /* Build configuration list for PBXNativeTarget &quot;WebContent&quot; */ = {
</span><span class="cx">                         isa = XCConfigurationList;
</span><span class="cx">                         buildConfigurations = (
</span></span></pre>
</div>
</div>

</body>
</html>