Changeset 86724 in webkit

Timestamp:

May 17, 2011 5:29:36 PM (13 years ago)

Author:

beidson@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=60595
Fix the rampant WebProcess crashing because we're trying to install the WebProcess shim
into QTKitServer when we launch it.

Rubberstamped by Sam Weinig.

• UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::ProcessLauncher::launchProcess): This is only happening on SnowLeopard, so put

SnowLeopard build guards around the shim install path.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-17  Brady Eidson  <beidson@apple.com>
+
+        Rubberstamped by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=60595
+        Fix the rampant WebProcess crashing because we're trying to install the WebProcess shim
+        into QTKitServer when we launch it.
+
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::ProcessLauncher::launchProcess): This is only happening on SnowLeopard, so put
+          SnowLeopard build guards around the shim install path.
+
 2011-05-17  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm

@@ -146 +146 @@
     if (m_launchOptions.processType == ProcessLauncher::PluginProcess)
         processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"PluginProcessShim.dylib"];
+#ifndef BUILDING_ON_SNOW_LEOPARD
     else if (m_launchOptions.processType == ProcessLauncher::WebProcess)
         processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"WebProcessShim.dylib"];
+#endif
     
     // Make sure that the shim library file exists and insert it.