Title: [86903] branches/safari-534.36-branch/Source/WebKit2
Diff
Modified: branches/safari-534.36-branch/Source/WebKit2/ChangeLog (86902 => 86903)
--- branches/safari-534.36-branch/Source/WebKit2/ChangeLog 2011-05-19 22:51:37 UTC (rev 86902)
+++ branches/safari-534.36-branch/Source/WebKit2/ChangeLog 2011-05-19 22:53:52 UTC (rev 86903)
@@ -1,5 +1,26 @@
2011-05-19 Lucas Forschler <[email protected]
+ Merged r86820.
+
+ 2011-05-18 Brady Eidson <[email protected]>
+
+ As originally reviewed by Anders Carlsson.
+
+ <rdar://problem/9457633> and https://bugs.webkit.org/show_bug.cgi?id=61009
+ Processes spawned by SnowLeopard's WebProcess attempt to install WebKit2 shims.
+
+ Restore r86797 to how it was supposed to be using the appropriate #ifdef,
+ reverting the temporary r86814 in the process.
+
+ The #ifdef is BUILDING_ON_SNOW_LEOPARD, not BUILDING_ON_SNOWLEOPARD!
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::ProcessLauncher::launchProcess):
+ * WebProcess/mac/WebProcessMainMac.mm:
+ (WebKit::WebProcessMain):
+
+2011-05-19 Lucas Forschler <[email protected]
+
Merged r86814.
2011-05-18 Brady Eidson <[email protected]>
Modified: branches/safari-534.36-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (86902 => 86903)
--- branches/safari-534.36-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2011-05-19 22:51:37 UTC (rev 86902)
+++ branches/safari-534.36-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2011-05-19 22:53:52 UTC (rev 86903)
@@ -145,10 +145,9 @@
NSString *processShimPathNSString = nil;
if (m_launchOptions.processType == ProcessLauncher::PluginProcess)
processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"PluginProcessShim.dylib"];
-#ifndef BUILDING_ON_SNOWLEOPARD
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) {
const char* processShimPath = [processShimPathNSString fileSystemRepresentation];
Modified: branches/safari-534.36-branch/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm (86902 => 86903)
--- branches/safari-534.36-branch/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-05-19 22:51:37 UTC (rev 86902)
+++ branches/safari-534.36-branch/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-05-19 22:53:52 UTC (rev 86903)
@@ -60,7 +60,7 @@
int WebProcessMain(const CommandLine& commandLine)
{
-#ifdef BUILDING_ON_SNOWLEOPARD
+#ifdef BUILDING_ON_SNOW_LEOPARD
// Remove the WebProcess shim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by
// the WebProcess don't try to insert the shim and crash.
EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/WebProcessShim.dylib");
@@ -99,9 +99,7 @@
RunLoop::initializeMainRunLoop();
// Initialize the shim.
-#ifndef BUILDING_ON_SNOWLEOPARD
WebProcess::shared().initializeShim();
-#endif
// Create the connection.
WebProcess::shared().initialize(serverPort, RunLoop::main());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
