Title: [125176] trunk/Source/WebKit2
- Revision
- 125176
- Author
- [email protected]
- Date
- 2012-08-09 09:10:45 -0700 (Thu, 09 Aug 2012)
Log Message
<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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (125175 => 125176)
--- trunk/Source/WebKit2/ChangeLog 2012-08-09 15:49:58 UTC (rev 125175)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-09 16:10:45 UTC (rev 125176)
@@ -1,3 +1,14 @@
+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-08-09 Tim Horton <[email protected]>
Add optional debug logging for tiled scrolling
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (125175 => 125176)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-08-09 15:49:58 UTC (rev 125175)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-08-09 16:10:45 UTC (rev 125176)
@@ -169,7 +169,7 @@
posix_spawnattr_setflags(&attr, flags);
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- 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
