Title: [86902] branches/safari-534.36-branch/Source/WebKit2
Diff
Modified: branches/safari-534.36-branch/Source/WebKit2/ChangeLog (86901 => 86902)
--- branches/safari-534.36-branch/Source/WebKit2/ChangeLog 2011-05-19 22:46:51 UTC (rev 86901)
+++ branches/safari-534.36-branch/Source/WebKit2/ChangeLog 2011-05-19 22:51:37 UTC (rev 86902)
@@ -1,5 +1,18 @@
2011-05-19 Lucas Forschler <[email protected]
+ Merged r86814.
+
+ 2011-05-18 Brady Eidson <[email protected]>
+
+ Fix the WK2 SnowLeopard layouttests (again) until I can explore on a SnowLeopard machine tomorrow.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::ProcessLauncher::launchProcess):
+ * WebProcess/mac/WebProcessMainMac.mm:
+ (WebKit::WebProcessMain):
+
+2011-05-19 Lucas Forschler <[email protected]
+
Merged r86806.
2011-05-18 Chris Fleizach <[email protected]>
Modified: branches/safari-534.36-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (86901 => 86902)
--- branches/safari-534.36-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2011-05-19 22:46:51 UTC (rev 86901)
+++ branches/safari-534.36-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2011-05-19 22:51:37 UTC (rev 86902)
@@ -145,9 +145,10 @@
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 (86901 => 86902)
--- branches/safari-534.36-branch/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-05-19 22:46:51 UTC (rev 86901)
+++ branches/safari-534.36-branch/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-05-19 22:51:37 UTC (rev 86902)
@@ -99,7 +99,9 @@
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
