<!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>[174188] 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/174188">174188</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-01 16:54:48 -0700 (Wed, 01 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/174180">r174180</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/174183">r174183</a>, and <a href="http://trac.webkit.org/projects/webkit/changeset/174186">r174186</a>.
https://bugs.webkit.org/show_bug.cgi?id=137320
Broke the Mac MountainLion build. Will investigate offline.
(Requested by dydz on #webkit).
Reverted changesets:
"Clean up: Move XPC forward declarations in JavaScriptCore to
WTF SPI wrapper header"
https://bugs.webkit.org/show_bug.cgi?id=137277
http://trac.webkit.org/changeset/174180
"Attempt to fix the build after
<https://trac.webkit.org/changeset/174180>"
https://bugs.webkit.org/show_bug.cgi?id=137277
http://trac.webkit.org/changeset/174183
"Another attempt to fix the Mac build after
<https://trac.webkit.org/changeset/174180>"
https://bugs.webkit.org/show_bug.cgi?id=137277
http://trac.webkit.org/changeset/174186</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="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionmm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.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="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainDevelopmentmm">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainmm">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WTF/wtf/spi/darwin/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-10-01 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r174180, r174183, and r174186.
+ https://bugs.webkit.org/show_bug.cgi?id=137320
+
+ Broke the Mac MountainLion build. Will investigate offline.
+ (Requested by dydz on #webkit).
+
+ Reverted changesets:
+
+ "Clean up: Move XPC forward declarations in JavaScriptCore to
+ WTF SPI wrapper header"
+ https://bugs.webkit.org/show_bug.cgi?id=137277
+ http://trac.webkit.org/changeset/174180
+
+ "Attempt to fix the build after
+ <https://trac.webkit.org/changeset/174180>"
+ https://bugs.webkit.org/show_bug.cgi?id=137277
+ http://trac.webkit.org/changeset/174183
+
+ "Another attempt to fix the Mac build after
+ <https://trac.webkit.org/changeset/174180>"
+ https://bugs.webkit.org/show_bug.cgi?id=137277
+ http://trac.webkit.org/changeset/174186
+
</ins><span class="cx"> 2014-10-01 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up: Move XPC forward declarations in JavaScriptCore to WTF SPI wrapper header
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -36,9 +36,16 @@
</span><span class="cx"> #import <notify.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><del>-#import <wtf/spi/darwin/XPCSPI.h>
</del><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if __has_include(<xpc/xpc.h>)
+#import <xpc/xpc.h>
+#endif
+extern "C" {
+ xpc_connection_t xpc_connection_create_mach_service(const char* name, dispatch_queue_t, uint64_t flags);
+ void xpc_release(xpc_object_t);
+}
+
</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></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -31,8 +31,14 @@
</span><span class="cx"> #import <dispatch/dispatch.h>
</span><span class="cx"> #import <mutex>
</span><span class="cx"> #import <wtf/ThreadSafeRefCounted.h>
</span><del>-#import <wtf/spi/darwin/XPCSPI.h>
</del><span class="cx">
</span><ins>+#if __has_include(<xpc/xpc.h>)
+#import <xpc/xpc.h>
+#else
+typedef void* xpc_connection_t;
+typedef void* xpc_object_t;
+#endif
+
</ins><span class="cx"> OBJC_CLASS NSDictionary;
</span><span class="cx"> OBJC_CLASS NSString;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -31,8 +31,32 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/Ref.h>
</span><del>-#import <wtf/spi/darwin/XPCSPI.h>
</del><span class="cx">
</span><ins>+#if !__has_include(<xpc/xpc.h>)
+extern "C" {
+ typedef void (^xpc_handler_t)(xpc_object_t);
+ void xpc_connection_cancel(xpc_connection_t);
+ void xpc_connection_resume(xpc_connection_t);
+ void xpc_connection_send_message(xpc_connection_t, xpc_object_t message);
+ void xpc_connection_set_event_handler(xpc_connection_t, xpc_handler_t);
+ void xpc_connection_set_target_queue(xpc_connection_t, dispatch_queue_t);
+
+ xpc_object_t xpc_retain(xpc_object_t);
+ void xpc_release(xpc_object_t);
+
+ typedef void* xpc_type_t;
+ xpc_type_t xpc_get_type(xpc_object_t);
+
+ void* XPC_ERROR_CONNECTION_INVALID;
+ void* XPC_TYPE_DICTIONARY;
+ void* XPC_TYPE_ERROR;
+
+ xpc_object_t xpc_dictionary_create(const char* const* keys, const xpc_object_t* values, size_t count);
+ xpc_object_t xpc_dictionary_get_value(xpc_object_t, const char* key);
+ void xpc_dictionary_set_value(xpc_object_t, const char* key, xpc_object_t value);
+}
+#endif
+
</ins><span class="cx"> #if __has_include(<CoreFoundation/CFXPCBridge.h>)
</span><span class="cx"> #import <CoreFoundation/CFXPCBridge.h>
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/WTF/ChangeLog 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-10-01 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r174180, r174183, and r174186.
+ https://bugs.webkit.org/show_bug.cgi?id=137320
+
+ Broke the Mac MountainLion build. Will investigate offline.
+ (Requested by dydz on #webkit).
+
+ Reverted changesets:
+
+ "Clean up: Move XPC forward declarations in JavaScriptCore to
+ WTF SPI wrapper header"
+ https://bugs.webkit.org/show_bug.cgi?id=137277
+ http://trac.webkit.org/changeset/174180
+
+ "Attempt to fix the build after
+ <https://trac.webkit.org/changeset/174180>"
+ https://bugs.webkit.org/show_bug.cgi?id=137277
+ http://trac.webkit.org/changeset/174183
+
+ "Another attempt to fix the Mac build after
+ <https://trac.webkit.org/changeset/174180>"
+ https://bugs.webkit.org/show_bug.cgi?id=137277
+ http://trac.webkit.org/changeset/174186
+
</ins><span class="cx"> 2014-10-01 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Another attempt to fix the Mac build after <https://trac.webkit.org/changeset/174180>
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -275,7 +275,6 @@
</span><span class="cx"> CD5497AC15857D0300B5BC30 /* MediaTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5497AA15857D0300B5BC30 /* MediaTime.cpp */; };
</span><span class="cx"> CD5497AD15857D0300B5BC30 /* MediaTime.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5497AB15857D0300B5BC30 /* MediaTime.h */; };
</span><span class="cx"> CE46516E19DB1FB4003ECA05 /* NSMapTableSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */; };
</span><del>- CE73E02519DCB7AB00580D5C /* XPCSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE73E02419DCB7AB00580D5C /* XPCSPI.h */; };
</del><span class="cx"> E15556F518A0CC18006F48FB /* CryptographicUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */; };
</span><span class="cx"> E15556F618A0CC18006F48FB /* CryptographicUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = E15556F418A0CC18006F48FB /* CryptographicUtilities.h */; };
</span><span class="cx"> EB95E1F0161A72410089A2F5 /* ByteOrder.h in Headers */ = {isa = PBXBuildFile; fileRef = EB95E1EF161A72410089A2F5 /* ByteOrder.h */; };
</span><span class="lines">@@ -567,7 +566,6 @@
</span><span class="cx"> CD5497AA15857D0300B5BC30 /* MediaTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTime.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CD5497AB15857D0300B5BC30 /* MediaTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaTime.h; sourceTree = "<group>"; };
</span><span class="cx"> CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSMapTableSPI.h; sourceTree = "<group>"; };
</span><del>- CE73E02419DCB7AB00580D5C /* XPCSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCSPI.h; sourceTree = "<group>"; };
</del><span class="cx"> E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptographicUtilities.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E15556F418A0CC18006F48FB /* CryptographicUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptographicUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> EB95E1EF161A72410089A2F5 /* ByteOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteOrder.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -1002,19 +1000,10 @@
</span><span class="cx"> path = cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- CE73E02319DCB7AB00580D5C /* darwin */ = {
- isa = PBXGroup;
- children = (
- CE73E02419DCB7AB00580D5C /* XPCSPI.h */,
- );
- path = darwin;
- sourceTree = "<group>";
- };
</del><span class="cx"> CEF4820C19DA347600CC04B8 /* spi */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> CE46516C19DB1FB4003ECA05 /* cocoa */,
</span><del>- CE73E02319DCB7AB00580D5C /* darwin */,
</del><span class="cx"> );
</span><span class="cx"> path = spi;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -1210,7 +1199,6 @@
</span><span class="cx"> 1FA47C8B152502DA00568D1B /* WebCoreThread.h in Headers */,
</span><span class="cx"> A8A47446151A825B004123FF /* WTFString.h in Headers */,
</span><span class="cx"> A8A47487151A825B004123FF /* WTFThreadData.h in Headers */,
</span><del>- CE73E02519DCB7AB00580D5C /* XPCSPI.h in Headers */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-10-01 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r174180, r174183, and r174186.
+ https://bugs.webkit.org/show_bug.cgi?id=137320
+
+ Broke the Mac MountainLion build. Will investigate offline.
+ (Requested by dydz on #webkit).
+
+ Reverted changesets:
+
+ "Clean up: Move XPC forward declarations in JavaScriptCore to
+ WTF SPI wrapper header"
+ https://bugs.webkit.org/show_bug.cgi?id=137277
+ http://trac.webkit.org/changeset/174180
+
+ "Attempt to fix the build after
+ <https://trac.webkit.org/changeset/174180>"
+ https://bugs.webkit.org/show_bug.cgi?id=137277
+ http://trac.webkit.org/changeset/174183
+
+ "Another attempt to fix the Mac build after
+ <https://trac.webkit.org/changeset/174180>"
+ https://bugs.webkit.org/show_bug.cgi?id=137277
+ http://trac.webkit.org/changeset/174186
+
</ins><span class="cx"> 2014-10-01 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up: Move XPC forward declarations in JavaScriptCore to WTF SPI wrapper header
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx">
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> #include <mach/mach_port.h>
</span><ins>+#include <xpc/xpc.h>
</ins><span class="cx"> #include <wtf/OSObjectPtr.h>
</span><del>-#include <wtf/spi/darwin/XPCSPI.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -34,12 +34,19 @@
</span><span class="cx"> #include <mach/mach_error.h>
</span><span class="cx"> #include <mach/vm_map.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><del>-#include <wtf/spi/darwin/XPCSPI.h>
</del><ins>+#include <xpc/xpc.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "ProcessAssertion.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if __has_include(<xpc/private.h>)
+#include <xpc/private.h>
+#else
+extern "C" void xpc_connection_get_audit_token(xpc_connection_t, audit_token_t*);
+extern "C" void xpc_connection_kill(xpc_connection_t, int);
+#endif
+
</ins><span class="cx"> #if __has_include(<HIServices/AccessibilityPriv.h>)
</span><span class="cx"> #include <HIServices/AccessibilityPriv.h>
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainDevelopmentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #import <stdio.h>
</span><span class="cx"> #import <stdlib.h>
</span><span class="cx"> #import <wtf/OSObjectPtr.h>
</span><del>-#import <wtf/spi/darwin/XPCSPI.h>
</del><ins>+#import <xpc/xpc.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #import <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #import <wtf/OSObjectPtr.h>
</span><del>-#import <wtf/spi/darwin/XPCSPI.h>
</del><ins>+#import <xpc/xpc.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (174187 => 174188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-10-01 23:54:48 UTC (rev 174188)
</span><span class="lines">@@ -41,17 +41,27 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx"> #import <wtf/Threading.h>
</span><del>-#import <wtf/spi/darwin/XPCSPI.h>
</del><span class="cx"> #import <wtf/text/CString.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><ins>+#import <xpc/xpc.h>
</ins><span class="cx">
</span><ins>+#if __has_include(<xpc/private.h>)
+#import <xpc/private.h>
+#endif
+
</ins><span class="cx"> // FIXME: We should be doing this another way.
</span><span class="cx"> extern "C" kern_return_t bootstrap_register2(mach_port_t, name_t, mach_port_t, uint64_t);
</span><span class="cx">
</span><ins>+extern "C" void xpc_connection_set_instance(xpc_connection_t, uuid_t);
+extern "C" void xpc_dictionary_set_mach_send(xpc_object_t, const char*, mach_port_t);
+
</ins><span class="cx"> #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><ins>+extern "C" void xpc_connection_set_bootstrap(xpc_connection_t connection, xpc_object_t bootstrap);
+
</ins><span class="cx"> // FIXME: Soft linking is temporary, make this into a regular function call once this function is available everywhere we need.
</span><span class="cx"> SOFT_LINK_FRAMEWORK(CoreFoundation)
</span><span class="cx"> SOFT_LINK_OPTIONAL(CoreFoundation, _CFBundleSetupXPCBootstrap, void, unused, (xpc_object_t))
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre>
</div>
</div>
</body>
</html>