Title: [133481] branches/safari-536.28-branch/Source/WebKit2
- Revision
- 133481
- Author
- [email protected]
- Date
- 2012-11-05 08:20:35 -0800 (Mon, 05 Nov 2012)
Log Message
Merged r125176. <rdar://problem/12516381>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (133480 => 133481)
--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-05 16:16:51 UTC (rev 133480)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-05 16:20:35 UTC (rev 133481)
@@ -1,5 +1,20 @@
2012-11-05 Lucas Forschler <[email protected]>
+ Merge r125176
+
+ 2012-08-09 Dan Bernstein <[email protected]>
+
+ <rdar://problem/12035637> 32-bit PluginProcess launches without appropriate DYLD environment variables if UI process is 64-bit only
+ https://bugs.webkit.org/show_bug.cgi?id=93596
+
+ Reviewed by Mark Rowe.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::ProcessLauncher::launchProcess): Changed to pass the current architecture, rather than
+ the intended child process architecture, to the DynamicLinkerEnvironmentExtractor constructor.
+
+2012-11-05 Lucas Forschler <[email protected]>
+
Merge r125091
2012-08-08 Beth Dakin <[email protected]>
@@ -47390,3 +47405,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (133480 => 133481)
--- branches/safari-536.28-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-11-05 16:16:51 UTC (rev 133480)
+++ branches/safari-536.28-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-11-05 16:20:35 UTC (rev 133481)
@@ -169,7 +169,7 @@
posix_spawnattr_setflags(&attr, flags);
#ifndef BUILDING_ON_SNOW_LEOPARD
- DynamicLinkerEnvironmentExtractor environmentExtractor([[NSBundle mainBundle] executablePath], architecture);
+ DynamicLinkerEnvironmentExtractor environmentExtractor([[NSBundle mainBundle] executablePath], _NSGetMachExecuteHeader()->cputype);
environmentExtractor.getExtractedEnvironmentVariables(environmentVariables);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
