Changeset 231984 in webkit

Timestamp:

May 18, 2018 3:28:09 PM (6 years ago)

Author:

pvollan@apple.com

Message:

WebProcess fails to launch
​https://bugs.webkit.org/show_bug.cgi?id=185140

Reviewed by Geoffrey Garen.

If the NSApplication runloop is not used in the WebContent process, launchServicesCheckIn() needs to be called
in order for enableSandboxStyleFileQuarantine() to succeed. Determine at runtime if launchServicesCheckIn()
should be called by checking if the NSApplication event loop is running.

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-18  Per Arne Vollan  <pvollan@apple.com>
+
+        WebProcess fails to launch
+        https://bugs.webkit.org/show_bug.cgi?id=185140
+
+        Reviewed by Geoffrey Garen.
+
+        If the NSApplication runloop is not used in the WebContent process, launchServicesCheckIn() needs to be called
+        in order for enableSandboxStyleFileQuarantine() to succeed. Determine at runtime if launchServicesCheckIn()
+        should be called by checking if the NSApplication event loop is running.
+
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeProcess):
+
 2018-05-18  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -307 +307 @@
     CGSShutdownServerConnections();
 #else
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
-    // This call is needed when the WebProcess is not running the NSApplication event loop.
-    // Otherwise, calling enableSandboxStyleFileQuarantine() will fail.
-    launchServicesCheckIn();
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+    if (![NSApp isRunning]) {
+        // This call is needed when the WebProcess is not running the NSApplication event loop.
+        // Otherwise, calling enableSandboxStyleFileQuarantine() will fail.
+        launchServicesCheckIn();
+    }
 #endif // ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
 #endif // PLATFORM(MAC)