Title: [86724] trunk/Source/WebKit2
- Revision
- 86724
- Author
- [email protected]
- Date
- 2011-05-17 17:29:36 -0700 (Tue, 17 May 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (86723 => 86724)
--- trunk/Source/WebKit2/ChangeLog 2011-05-18 00:21:33 UTC (rev 86723)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-18 00:29:36 UTC (rev 86724)
@@ -1,3 +1,15 @@
+2011-05-17 Brady Eidson <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r86668.
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (86723 => 86724)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2011-05-18 00:21:33 UTC (rev 86723)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2011-05-18 00:29:36 UTC (rev 86724)
@@ -145,8 +145,10 @@
NSString *processShimPathNSString = nil;
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.
if (processShimPathNSString) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
