Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (174187 => 174188)
--- trunk/Source/_javascript_Core/ChangeLog 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-10-01 23:54:48 UTC (rev 174188)
@@ -1,3 +1,28 @@
+2014-10-01 Commit Queue <commit-qu...@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 _javascript_Core 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
+
2014-10-01 Daniel Bates <daba...@apple.com>
Clean up: Move XPC forward declarations in _javascript_Core to WTF SPI wrapper header
Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm (174187 => 174188)
--- trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2014-10-01 23:54:48 UTC (rev 174188)
@@ -36,9 +36,16 @@
#import <notify.h>
#import <wtf/Assertions.h>
#import <wtf/NeverDestroyed.h>
-#import <wtf/spi/darwin/XPCSPI.h>
#import <wtf/text/WTFString.h>
+#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);
+}
+
#if __has_include(<sandbox/private.h>)
#import <sandbox/private.h>
#else
Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspectorXPCConnection.h (174187 => 174188)
--- trunk/Source/_javascript_Core/inspector/remote/RemoteInspectorXPCConnection.h 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspectorXPCConnection.h 2014-10-01 23:54:48 UTC (rev 174188)
@@ -31,8 +31,14 @@
#import <dispatch/dispatch.h>
#import <mutex>
#import <wtf/ThreadSafeRefCounted.h>
-#import <wtf/spi/darwin/XPCSPI.h>
+#if __has_include(<xpc/xpc.h>)
+#import <xpc/xpc.h>
+#else
+typedef void* xpc_connection_t;
+typedef void* xpc_object_t;
+#endif
+
OBJC_CLASS NSDictionary;
OBJC_CLASS NSString;
Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspectorXPCConnection.mm (174187 => 174188)
--- trunk/Source/_javascript_Core/inspector/remote/RemoteInspectorXPCConnection.mm 2014-10-01 23:29:16 UTC (rev 174187)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspectorXPCConnection.mm 2014-10-01 23:54:48 UTC (rev 174188)
@@ -31,8 +31,32 @@
#import <Foundation/Foundation.h>
#import <wtf/Assertions.h>
#import <wtf/Ref.h>
-#import <wtf/spi/darwin/XPCSPI.h>
+#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
+
#if __has_include(<CoreFoundation/CFXPCBridge.h>)
#import <CoreFoundation/CFXPCBridge.h>
#else
Modified: trunk/Source/WTF/ChangeLog (174187 => 174188)
--- 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)
@@ -1,3 +1,28 @@
+2014-10-01 Commit Queue <commit-qu...@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 _javascript_Core 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
+
2014-10-01 Daniel Bates <daba...@apple.com>
Another attempt to fix the Mac build after <https://trac.webkit.org/changeset/174180>
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (174187 => 174188)
--- 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)
@@ -275,7 +275,6 @@
CD5497AC15857D0300B5BC30 /* MediaTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5497AA15857D0300B5BC30 /* MediaTime.cpp */; };
CD5497AD15857D0300B5BC30 /* MediaTime.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5497AB15857D0300B5BC30 /* MediaTime.h */; };
CE46516E19DB1FB4003ECA05 /* NSMapTableSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */; };
- CE73E02519DCB7AB00580D5C /* XPCSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE73E02419DCB7AB00580D5C /* XPCSPI.h */; };
E15556F518A0CC18006F48FB /* CryptographicUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */; };
E15556F618A0CC18006F48FB /* CryptographicUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = E15556F418A0CC18006F48FB /* CryptographicUtilities.h */; };
EB95E1F0161A72410089A2F5 /* ByteOrder.h in Headers */ = {isa = PBXBuildFile; fileRef = EB95E1EF161A72410089A2F5 /* ByteOrder.h */; };
@@ -567,7 +566,6 @@
CD5497AA15857D0300B5BC30 /* MediaTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTime.cpp; sourceTree = "<group>"; };
CD5497AB15857D0300B5BC30 /* MediaTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaTime.h; sourceTree = "<group>"; };
CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSMapTableSPI.h; sourceTree = "<group>"; };
- CE73E02419DCB7AB00580D5C /* XPCSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCSPI.h; sourceTree = "<group>"; };
E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptographicUtilities.cpp; sourceTree = "<group>"; };
E15556F418A0CC18006F48FB /* CryptographicUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptographicUtilities.h; sourceTree = "<group>"; };
EB95E1EF161A72410089A2F5 /* ByteOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteOrder.h; sourceTree = "<group>"; };
@@ -1002,19 +1000,10 @@
path = cocoa;
sourceTree = "<group>";
};
- CE73E02319DCB7AB00580D5C /* darwin */ = {
- isa = PBXGroup;
- children = (
- CE73E02419DCB7AB00580D5C /* XPCSPI.h */,
- );
- path = darwin;
- sourceTree = "<group>";
- };
CEF4820C19DA347600CC04B8 /* spi */ = {
isa = PBXGroup;
children = (
CE46516C19DB1FB4003ECA05 /* cocoa */,
- CE73E02319DCB7AB00580D5C /* darwin */,
);
path = spi;
sourceTree = "<group>";
@@ -1210,7 +1199,6 @@
1FA47C8B152502DA00568D1B /* WebCoreThread.h in Headers */,
A8A47446151A825B004123FF /* WTFString.h in Headers */,
A8A47487151A825B004123FF /* WTFThreadData.h in Headers */,
- CE73E02519DCB7AB00580D5C /* XPCSPI.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Source/WebKit2/ChangeLog (174187 => 174188)
--- 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)
@@ -1,3 +1,28 @@
+2014-10-01 Commit Queue <commit-qu...@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 _javascript_Core 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
+
2014-10-01 Daniel Bates <daba...@apple.com>
Clean up: Move XPC forward declarations in _javascript_Core to WTF SPI wrapper header
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (174187 => 174188)
--- 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)
@@ -42,8 +42,8 @@
#if OS(DARWIN)
#include <mach/mach_port.h>
+#include <xpc/xpc.h>
#include <wtf/OSObjectPtr.h>
-#include <wtf/spi/darwin/XPCSPI.h>
#endif
#if PLATFORM(GTK) || PLATFORM(EFL)
Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (174187 => 174188)
--- 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)
@@ -34,12 +34,19 @@
#include <mach/mach_error.h>
#include <mach/vm_map.h>
#include <wtf/RunLoop.h>
-#include <wtf/spi/darwin/XPCSPI.h>
+#include <xpc/xpc.h>
#if PLATFORM(IOS)
#include "ProcessAssertion.h"
#endif
+#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
+
#if __has_include(<HIServices/AccessibilityPriv.h>)
#include <HIServices/AccessibilityPriv.h>
#else
Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm (174187 => 174188)
--- 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)
@@ -32,7 +32,7 @@
#import <stdio.h>
#import <stdlib.h>
#import <wtf/OSObjectPtr.h>
-#import <wtf/spi/darwin/XPCSPI.h>
+#import <xpc/xpc.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm (174187 => 174188)
--- 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)
@@ -27,7 +27,7 @@
#import <CoreFoundation/CoreFoundation.h>
#import <wtf/OSObjectPtr.h>
-#import <wtf/spi/darwin/XPCSPI.h>
+#import <xpc/xpc.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (174187 => 174188)
--- 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)
@@ -41,17 +41,27 @@
#import <wtf/RetainPtr.h>
#import <wtf/RunLoop.h>
#import <wtf/Threading.h>
-#import <wtf/spi/darwin/XPCSPI.h>
#import <wtf/text/CString.h>
#import <wtf/text/WTFString.h>
+#import <xpc/xpc.h>
+#if __has_include(<xpc/private.h>)
+#import <xpc/private.h>
+#endif
+
// FIXME: We should be doing this another way.
extern "C" kern_return_t bootstrap_register2(mach_port_t, name_t, mach_port_t, uint64_t);
+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);
+
#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+extern "C" void xpc_connection_set_bootstrap(xpc_connection_t connection, xpc_object_t bootstrap);
+
// FIXME: Soft linking is temporary, make this into a regular function call once this function is available everywhere we need.
SOFT_LINK_FRAMEWORK(CoreFoundation)
SOFT_LINK_OPTIONAL(CoreFoundation, _CFBundleSetupXPCBootstrap, void, unused, (xpc_object_t))
+
#endif
namespace WebKit {
