<!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>[193783] trunk/Source</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/193783">193783</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-08 13:49:26 -0800 (Tue, 08 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Create a Sandbox SPI header
https://bugs.webkit.org/show_bug.cgi?id=151981
Reviewed by Andy Estes.
Source/JavaScriptCore:
* inspector/remote/RemoteInspector.mm:
Source/WebKit2:
* PluginProcess/mac/PluginProcessShim.mm:
* Shared/ios/ChildProcessIOS.mm:
* Shared/mac/ChildProcessMac.mm:
* Shared/mac/SandboxUtilities.mm:
Source/WTF:
* WTF.xcodeproj/project.pbxproj:
* wtf/spi/darwin/SandboxSPI.h: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmacPluginProcessShimmm">trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm</a></li>
<li><a href="#trunkSourceWebKit2SharediosChildProcessIOSmm">trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacChildProcessMacmm">trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSandboxUtilitiesmm">trunk/Source/WebKit2/Shared/mac/SandboxUtilities.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfspidarwinSandboxSPIh">trunk/Source/WTF/wtf/spi/darwin/SandboxSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193782 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-08 21:45:54 UTC (rev 193782)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-12-08 Joseph Pecoraro <pecoraro@apple.com>
+
+ Create a Sandbox SPI header
+ https://bugs.webkit.org/show_bug.cgi?id=151981
+
+ Reviewed by Andy Estes.
+
+ * inspector/remote/RemoteInspector.mm:
+
</ins><span class="cx"> 2015-12-08 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG::UnificationPhase should merge isProfitableToUnbox, since this may have been set in ByteCodeParser
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm (193782 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2015-12-08 21:45:54 UTC (rev 193782)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -39,20 +39,10 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><ins>+#import <wtf/spi/darwin/SandboxSPI.h>
</ins><span class="cx"> #import <wtf/spi/darwin/XPCSPI.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if __has_include(<sandbox/private.h>)
-#import <sandbox/private.h>
-#else
-enum sandbox_filter_type {
- SANDBOX_FILTER_GLOBAL_NAME = 2,
-};
-#endif
-
-extern "C" int sandbox_check(pid_t, const char *operation, enum sandbox_filter_type, ...);
-extern "C" const enum sandbox_filter_type SANDBOX_CHECK_NO_REPORT;
-
</del><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> static bool canAccessWebInspectorMachPort()
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (193782 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-12-08 21:45:54 UTC (rev 193782)
+++ trunk/Source/WTF/ChangeLog 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-12-08 Joseph Pecoraro <pecoraro@apple.com>
+
+ Create a Sandbox SPI header
+ https://bugs.webkit.org/show_bug.cgi?id=151981
+
+ Reviewed by Andy Estes.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/spi/darwin/SandboxSPI.h: Added.
+
</ins><span class="cx"> 2015-12-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL B3 should be able to flag the tag constants as being super important so that B3 can hoist them and Air can force them into registers
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (193782 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-12-08 21:45:54 UTC (rev 193782)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -114,6 +114,7 @@
</span><span class="cx"> 974CFC8E16A4F327006D5404 /* WeakPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 974CFC8D16A4F327006D5404 /* WeakPtr.h */; };
</span><span class="cx"> 9BC70F05176C379D00101DEC /* AtomicStringTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BC70F04176C379D00101DEC /* AtomicStringTable.cpp */; };
</span><span class="cx"> 9BD8F40B176C2B470002D865 /* AtomicStringTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BD8F40A176C2AD80002D865 /* AtomicStringTable.h */; };
</span><ins>+ A5098B001C169E0700087797 /* SandboxSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A5098AFF1C169E0700087797 /* SandboxSPI.h */; };
</ins><span class="cx"> A5BA15F3182433A900A82E69 /* StringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F2182433A900A82E69 /* StringMac.mm */; };
</span><span class="cx"> A5BA15F51824348000A82E69 /* StringImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F41824348000A82E69 /* StringImplMac.mm */; };
</span><span class="cx"> A5BA15FA182435A600A82E69 /* AtomicStringImplCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F7182435A600A82E69 /* AtomicStringImplCF.cpp */; };
</span><span class="lines">@@ -420,6 +421,7 @@
</span><span class="cx"> 974CFC8D16A4F327006D5404 /* WeakPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakPtr.h; sourceTree = "<group>"; };
</span><span class="cx"> 9BC70F04176C379D00101DEC /* AtomicStringTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicStringTable.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9BD8F40A176C2AD80002D865 /* AtomicStringTable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AtomicStringTable.h; sourceTree = "<group>"; };
</span><ins>+ A5098AFF1C169E0700087797 /* SandboxSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> A5BA15F2182433A900A82E69 /* StringMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = StringMac.mm; path = mac/StringMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> A5BA15F41824348000A82E69 /* StringImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = StringImplMac.mm; path = mac/StringImplMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> A5BA15F7182435A600A82E69 /* AtomicStringImplCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AtomicStringImplCF.cpp; path = cf/AtomicStringImplCF.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -1057,6 +1059,7 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> DE5A09FB1BA36992003D4424 /* CommonCryptoSPI.h */,
</span><ins>+ A5098AFF1C169E0700087797 /* SandboxSPI.h */,
</ins><span class="cx"> CE73E02419DCB7AB00580D5C /* XPCSPI.h */,
</span><span class="cx"> );
</span><span class="cx"> path = darwin;
</span><span class="lines">@@ -1274,6 +1277,7 @@
</span><span class="cx"> A8A4747D151A825B004123FF /* ValueCheck.h in Headers */,
</span><span class="cx"> A8A4747E151A825B004123FF /* Vector.h in Headers */,
</span><span class="cx"> A8A4747F151A825B004123FF /* VectorTraits.h in Headers */,
</span><ins>+ A5098B001C169E0700087797 /* SandboxSPI.h in Headers */,
</ins><span class="cx"> A8A47480151A825B004123FF /* VMTags.h in Headers */,
</span><span class="cx"> 974CFC8E16A4F327006D5404 /* WeakPtr.h in Headers */,
</span><span class="cx"> 1FA47C8B152502DA00568D1B /* WebCoreThread.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfspidarwinSandboxSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/spi/darwin/SandboxSPI.h (0 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/spi/darwin/SandboxSPI.h (rev 0)
+++ trunk/Source/WTF/wtf/spi/darwin/SandboxSPI.h 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SandboxSPI_h
+#define SandboxSPI_h
+
+#if OS(DARWIN)
+
+#import <sandbox.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <sandbox/private.h>
+#else
+enum sandbox_filter_type {
+ SANDBOX_FILTER_NONE,
+ SANDBOX_FILTER_GLOBAL_NAME = 2,
+};
+
+#define SANDBOX_NAMED_EXTERNAL 0x0003
+#endif
+
+EXTERN_C const enum sandbox_filter_type SANDBOX_CHECK_NO_REPORT;
+EXTERN_C int sandbox_check(pid_t, const char *operation, enum sandbox_filter_type, ...);
+EXTERN_C int sandbox_container_path_for_pid(pid_t, char *buffer, size_t bufsize);
+EXTERN_C int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+
+#endif // OS(DARWIN)
+
+#endif // SandboxSPI_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (193782 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-08 21:45:54 UTC (rev 193782)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-08 Joseph Pecoraro <pecoraro@apple.com>
+
+ Create a Sandbox SPI header
+ https://bugs.webkit.org/show_bug.cgi?id=151981
+
+ Reviewed by Andy Estes.
+
+ * PluginProcess/mac/PluginProcessShim.mm:
+ * Shared/ios/ChildProcessIOS.mm:
+ * Shared/mac/ChildProcessMac.mm:
+ * Shared/mac/SandboxUtilities.mm:
+
</ins><span class="cx"> 2015-12-08 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Rename UserMediaClient and UserMediaController methods
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginProcessShimmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (193782 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2015-12-08 21:45:54 UTC (rev 193782)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -32,23 +32,13 @@
</span><span class="cx"> #import <Carbon/Carbon.h>
</span><span class="cx"> #import <WebCore/DynamicLinkerInterposing.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><del>-#import <stdio.h>
</del><span class="cx"> #import <objc/message.h>
</span><ins>+#import <stdio.h>
+#import <sys/ipc.h>
+#import <sys/mman.h>
+#import <sys/shm.h>
+#import <wtf/spi/darwin/SandboxSPI.h>
</ins><span class="cx">
</span><del>-#include <sys/shm.h>
-#include <sys/ipc.h>
-#include <sys/mman.h>
-
-#undef __APPLE_API_PRIVATE
-#include <sandbox.h>
-
-#ifndef _SANDBOX_PRIVATE_H_
-enum sandbox_filter_type {
- SANDBOX_FILTER_NONE,
-};
-extern "C" int sandbox_check(pid_t pid, const char *operation, enum sandbox_filter_type type, ...);
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> extern "C" void WebKitPluginProcessShimInitialize(const PluginProcessShimCallbacks& callbacks);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosChildProcessIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm (193782 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm 2015-12-08 21:45:54 UTC (rev 193782)
+++ trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "SandboxInitializationParameters.h"
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><span class="cx"> #import <WebCore/FileSystem.h>
</span><ins>+#import <WebCore/FloatingPointEnvironment.h>
</ins><span class="cx"> #import <WebCore/SystemVersion.h>
</span><span class="cx"> #import <mach/mach.h>
</span><span class="cx"> #import <mach/task.h>
</span><span class="lines">@@ -39,17 +40,8 @@
</span><span class="cx"> #import <stdlib.h>
</span><span class="cx"> #import <sysexits.h>
</span><span class="cx">
</span><del>-#import <WebCore/FloatingPointEnvironment.h>
-
</del><span class="cx"> #if ENABLE(MANUAL_SANDBOXING)
</span><del>-
-// We have to #undef __APPLE_API_PRIVATE to prevent sandbox.h from looking for a header file that does not exist (<rdar://problem/9679211>).
-#undef __APPLE_API_PRIVATE
-#import <sandbox.h>
-
-#define SANDBOX_NAMED_EXTERNAL 0x0003
-extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
-
</del><ins>+#import <wtf/spi/darwin/SandboxSPI.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacChildProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (193782 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2015-12-08 21:45:54 UTC (rev 193782)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -38,14 +38,8 @@
</span><span class="cx"> #import <pwd.h>
</span><span class="cx"> #import <stdlib.h>
</span><span class="cx"> #import <sysexits.h>
</span><ins>+#import <wtf/spi/darwin/SandboxSPI.h>
</ins><span class="cx">
</span><del>-// We have to #undef __APPLE_API_PRIVATE to prevent sandbox.h from looking for a header file that does not exist (<rdar://problem/9679211>).
-#undef __APPLE_API_PRIVATE
-#import <sandbox.h>
-
-#define SANDBOX_NAMED_EXTERNAL 0x0003
-extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
-
</del><span class="cx"> #ifdef __has_include
</span><span class="cx"> #if __has_include(<HIServices/ProcessesPriv.h>)
</span><span class="cx"> #include <HIServices/ProcessesPriv.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSandboxUtilitiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SandboxUtilities.mm (193782 => 193783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SandboxUtilities.mm 2015-12-08 21:45:54 UTC (rev 193782)
+++ trunk/Source/WebKit2/Shared/mac/SandboxUtilities.mm 2015-12-08 21:49:26 UTC (rev 193783)
</span><span class="lines">@@ -29,20 +29,9 @@
</span><span class="cx"> #import <WebCore/SecuritySPI.h>
</span><span class="cx"> #import <array>
</span><span class="cx"> #import <sys/param.h>
</span><ins>+#import <wtf/spi/darwin/SandboxSPI.h>
</ins><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if __has_include(<sandbox/private.h>)
-#import <sandbox/private.h>
-#else
-enum sandbox_filter_type {
- SANDBOX_FILTER_NONE,
-};
-extern "C" {
-int sandbox_check(pid_t, const char *operation, enum sandbox_filter_type, ...);
-int sandbox_container_path_for_pid(pid_t, char *buffer, size_t bufsize);
-}
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> bool processIsSandboxed(pid_t pid)
</span></span></pre>
</div>
</div>
</body>
</html>