Diff
Modified: trunk/Source/WebKit2/ChangeLog (205419 => 205420)
--- trunk/Source/WebKit2/ChangeLog 2016-09-04 13:42:42 UTC (rev 205419)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-04 18:11:57 UTC (rev 205420)
@@ -1,3 +1,22 @@
+2016-09-04 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Wrapping XPC service execution in os_activity is no longer needed
+ https://bugs.webkit.org/show_bug.cgi?id=161577
+
+ Reviewed by Sam Weinig.
+
+ Removed code that created an os_activity around the execution of the XPC service
+ code, because this workaround is no longer needed.
+
+ * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm:
+ (DatabaseServiceInitializer):
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:
+ (NetworkServiceInitializer):
+ * PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm:
+ (PluginServiceInitializer):
+ * WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm:
+ (WebContentServiceInitializer):
+
2016-09-04 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r205415.
Modified: trunk/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm (205419 => 205420)
--- trunk/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm 2016-09-04 13:42:42 UTC (rev 205419)
+++ trunk/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm 2016-09-04 18:11:57 UTC (rev 205420)
@@ -30,10 +30,6 @@
#import "WKBase.h"
#import "XPCServiceEntryPoint.h"
-#if HAVE(OS_ACTIVITY)
-#include <os/activity.h>
-#endif
-
using namespace WebKit;
extern "C" WK_EXPORT void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage);
@@ -40,19 +36,5 @@
void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
{
-#if HAVE(OS_ACTIVITY)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- os_activity_t activity = os_activity_start("com.apple.WebKit.Databases", OS_ACTIVITY_FLAG_DEFAULT);
-#pragma clang diagnostic pop
-#endif
-
XPCServiceInitializer<DatabaseProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
-
-#if HAVE(OS_ACTIVITY)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- os_activity_end(activity);
-#pragma clang diagnostic pop
-#endif
}
Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm (205419 => 205420)
--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm 2016-09-04 13:42:42 UTC (rev 205419)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm 2016-09-04 18:11:57 UTC (rev 205420)
@@ -30,10 +30,6 @@
#import "WKBase.h"
#import "XPCServiceEntryPoint.h"
-#if HAVE(OS_ACTIVITY)
-#include <os/activity.h>
-#endif
-
namespace WebKit {
class NetworkServiceInitializerDelegate : public XPCServiceInitializerDelegate {
@@ -55,20 +51,5 @@
// Remove the SecItemShim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by
// the this process don't try to insert the shim and crash.
EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/SecItemShim.dylib");
-
-#if HAVE(OS_ACTIVITY)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- os_activity_t activity = os_activity_start("com.apple.WebKit.Networking", OS_ACTIVITY_FLAG_DEFAULT);
-#pragma clang diagnostic pop
-#endif
-
XPCServiceInitializer<NetworkProcess, NetworkServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
-
-#if HAVE(OS_ACTIVITY)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- os_activity_end(activity);
-#pragma clang diagnostic pop
-#endif
}
Modified: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm (205419 => 205420)
--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm 2016-09-04 13:42:42 UTC (rev 205419)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm 2016-09-04 18:11:57 UTC (rev 205420)
@@ -31,10 +31,6 @@
#import "XPCServiceEntryPoint.h"
#import <wtf/RunLoop.h>
-#if HAVE(OS_ACTIVITY)
-#include <os/activity.h>
-#endif
-
#if ENABLE(NETSCAPE_PLUGIN_API)
namespace WebKit {
@@ -79,21 +75,6 @@
// Remove the PluginProcess shim from the DYLD_INSERT_LIBRARIES environment variable so any processes
// spawned by the PluginProcess don't try to insert the shim and crash.
EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/PluginProcessShim.dylib");
-
-#if HAVE(OS_ACTIVITY)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- os_activity_t activity = os_activity_start("com.apple.WebKit.Plugin", OS_ACTIVITY_FLAG_DEFAULT);
-#pragma clang diagnostic pop
-#endif
-
XPCServiceInitializer<PluginProcess, PluginServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
-
-#if HAVE(OS_ACTIVITY)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- os_activity_end(activity);
-#pragma clang diagnostic pop
-#endif
#endif // ENABLE(NETSCAPE_PLUGIN_API)
}
Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm (205419 => 205420)
--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm 2016-09-04 13:42:42 UTC (rev 205419)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm 2016-09-04 18:11:57 UTC (rev 205420)
@@ -35,10 +35,6 @@
#import <WebCore/WebCoreThreadSystemInterface.h>
#endif
-#if HAVE(OS_ACTIVITY)
-#include <os/activity.h>
-#endif
-
using namespace WebCore;
using namespace WebKit;
@@ -50,13 +46,6 @@
// the this process don't try to insert the shim and crash.
EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/WebProcessShim.dylib");
-#if HAVE(OS_ACTIVITY)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- os_activity_t activity = os_activity_start("com.apple.WebKit.WebContent", OS_ACTIVITY_FLAG_DEFAULT);
-#pragma clang diagnostic pop
-#endif
-
#if PLATFORM(IOS)
GSInitialize();
InitWebCoreThreadSystemInterface();
@@ -63,11 +52,4 @@
#endif // PLATFORM(IOS)
XPCServiceInitializer<WebProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
-
-#if HAVE(OS_ACTIVITY)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- os_activity_end(activity);
-#pragma clang diagnostic pop
-#endif
}
