Title: [241235] trunk/Source/WebKit
- Revision
- 241235
- Author
- [email protected]
- Date
- 2019-02-08 23:04:47 -0800 (Fri, 08 Feb 2019)
Log Message
Speculative fix for Mojave API test after r241223
https://bugs.webkit.org/show_bug.cgi?id=194427
* Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
(WebKit::XPCInitializationHandler):
(WebKit::XPCServiceMain):
Set the __APPLEEVENTSSERVICENAME environment variable before handling any xpc messages like we used to.
I'll worry about making things right in the daemon later.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (241234 => 241235)
--- trunk/Source/WebKit/ChangeLog 2019-02-09 07:01:14 UTC (rev 241234)
+++ trunk/Source/WebKit/ChangeLog 2019-02-09 07:04:47 UTC (rev 241235)
@@ -1,3 +1,14 @@
+2019-02-08 Alex Christensen <[email protected]>
+
+ Speculative fix for Mojave API test after r241223
+ https://bugs.webkit.org/show_bug.cgi?id=194427
+
+ * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
+ (WebKit::XPCInitializationHandler):
+ (WebKit::XPCServiceMain):
+ Set the __APPLEEVENTSSERVICENAME environment variable before handling any xpc messages like we used to.
+ I'll worry about making things right in the daemon later.
+
2019-02-08 Chris Dumez <[email protected]>
[WK2][macOS] Avoid creating new CVDisplayLink objects for each WebProcess
Modified: trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm (241234 => 241235)
--- trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm 2019-02-09 07:01:14 UTC (rev 241234)
+++ trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm 2019-02-09 07:04:47 UTC (rev 241235)
@@ -108,19 +108,6 @@
static std::once_flag once;
std::call_once(once, [event] {
-#if PLATFORM(MAC)
- // Don't allow Apple Events in WebKit processes. This can be removed when <rdar://problem/14012823> is fixed.
- setenv("__APPLEEVENTSSERVICENAME", "", 1);
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
- // We don't need to talk to the dock.
- if (Class nsApplicationClass = NSClassFromString(@"NSApplication")) {
- if ([nsApplicationClass respondsToSelector:@selector(_preventDockConnections)])
- [nsApplicationClass _preventDockConnections];
- }
-#endif
-#endif
-
#if defined(__i386__)
// FIXME: This should only be done for the 32-bit plug-in XPC service so we rely on the fact that
// it's the only of the XPC services that are 32-bit. We should come up with a more targeted #if check.
@@ -169,6 +156,19 @@
int XPCServiceMain(int, const char**)
{
+#if PLATFORM(MAC)
+ // Don't allow Apple Events in WebKit processes. This can be removed when <rdar://problem/14012823> is fixed.
+ setenv("__APPLEEVENTSSERVICENAME", "", 1);
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+ // We don't need to talk to the dock.
+ if (Class nsApplicationClass = NSClassFromString(@"NSApplication")) {
+ if ([nsApplicationClass respondsToSelector:@selector(_preventDockConnections)])
+ [nsApplicationClass _preventDockConnections];
+ }
+#endif
+#endif
+
xpc_main([] (xpc_connection_t peer) {
XPCEventHandler(peer, AuxiliaryProcessType::XPCService);
});
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
