Diff
Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (239598 => 239599)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2019-01-03 21:58:26 UTC (rev 239598)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2019-01-03 21:58:33 UTC (rev 239599)
@@ -1,3 +1,7 @@
+2019-01-03 Alan Coon <[email protected]>
+
+ Revert r239479. rdar://problem/46902869
+
2018-12-20 Alan Coon <[email protected]>
Apply patch. rdar://problem/46881088
Modified: branches/safari-606-branch/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm (239598 => 239599)
--- branches/safari-606-branch/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2019-01-03 21:58:26 UTC (rev 239598)
+++ branches/safari-606-branch/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2019-01-03 21:58:33 UTC (rev 239599)
@@ -101,7 +101,7 @@
{
ASSERT(!m_xpcConnection);
- m_xpcConnection = adoptOSObject(xpc_connection_create(serviceName(m_launchOptions), nullptr));
+ m_xpcConnection = adoptOSObject(xpc_connection_create(serviceName(m_launchOptions), dispatch_get_main_queue()));
uuid_t uuid;
uuid_generate(uuid);
@@ -200,7 +200,8 @@
xpc_dictionary_set_value(bootstrapMessage.get(), "extra-initialization-data", extraInitializationData.get());
- auto errorHandlerImpl = [weakProcessLauncher = makeWeakPtr(*this), listeningPort] (xpc_object_t event) {
+ auto weakProcessLauncher = makeWeakPtr(*this);
+ auto errorHandler = [weakProcessLauncher, listeningPort](xpc_object_t event) {
ASSERT(!event || xpc_get_type(event) == XPC_TYPE_ERROR);
auto processLauncher = weakProcessLauncher.get();
@@ -229,18 +230,14 @@
processLauncher->didFinishLaunchingProcess(0, IPC::Connection::Identifier());
};
- auto errorHandler = [errorHandlerImpl = WTFMove(errorHandlerImpl)] (xpc_object_t event) mutable {
- RunLoop::main().dispatch([errorHandlerImpl = WTFMove(errorHandlerImpl), event] {
- errorHandlerImpl(event);
- });
- };
-
xpc_connection_set_event_handler(m_xpcConnection.get(), errorHandler);
xpc_connection_resume(m_xpcConnection.get());
if (UNLIKELY(m_launchOptions.shouldMakeProcessLaunchFailForTesting)) {
- errorHandler(nullptr);
+ RunLoop::main().dispatch([errorHandler = WTFMove(errorHandler)] {
+ errorHandler(nullptr);
+ });
return;
}
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
