Changeset 248862 in webkit

Timestamp:

Aug 19, 2019, 1:56:08 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Move call to initializeMainThread introduced in r248549 to after WebKit.framework has been loaded
​https://bugs.webkit.org/show_bug.cgi?id=200896
<rdar://problem/54479065>

Reviewed by Chris Dumez.

In XPCServiceMain we haven't been told which WebKit.framework to load yet, so when using staged frameworks it
causes problems if we call a function from a WebKit framework. We need to wait until after initializerFunctionPtr is called.

• NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm:

(NetworkServiceInitializer):

• PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm:

(PluginServiceInitializer):

• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:

(WebKit::XPCServiceMain):

• WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm:

(WebContentServiceInitializer):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm (modified) (1 diff)
• PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm (modified) (1 diff)
• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm (modified) (1 diff)
• WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-19  Alex Christensen  <achristensen@webkit.org>
+
+        Move call to initializeMainThread introduced in r248549 to after WebKit.framework has been loaded
+        https://bugs.webkit.org/show_bug.cgi?id=200896
+        <rdar://problem/54479065>
+
+        Reviewed by Chris Dumez.
+
+        In XPCServiceMain we haven't been told which WebKit.framework to load yet, so when using staged frameworks it
+        causes problems if we call a function from a WebKit framework.  We need to wait until after initializerFunctionPtr is called.
+
+        * NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm:
+        (NetworkServiceInitializer):
+        * PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm:
+        (PluginServiceInitializer):
+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
+        (WebKit::XPCServiceMain):
+        * WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm:
+        (WebContentServiceInitializer):
+
 2019-08-19  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebKit/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm

@@ -55 +55 @@
 void NetworkServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
 {
+    WTF::initializeMainThread();
+
     // 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.

trunk/Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm

@@ -75 +75 @@
 {
 #if ENABLE(NETSCAPE_PLUGIN_API)
+    WTF::initializeMainThread();
+
     // FIXME: Add support for teardown from PluginProcessMain.mm
 

trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm

@@ -145 +145 @@
 #endif
 
-    WTF::initializeMainThread();
-
     xpc_main(XPCServiceEventHandler);
     return 0;

trunk/Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm

@@ -40 +40 @@
 void WebContentServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
 {
+    WTF::initializeMainThread();
+
     // Remove the WebProcessShim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by
     // the this process don't try to insert the shim and crash.