Title: [152555] trunk/Source/WebKit2
- Revision
- 152555
- Author
- [email protected]
- Date
- 2013-07-10 17:13:57 -0700 (Wed, 10 Jul 2013)
Log Message
<rdar://problem/14395759> PluginProcess sometimes logs an error about being unable to load WebKit2.framework.
Reviewed by Alexey Proskuryakov.
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::createPropertyListFile): Ensure that any environment variables
specified in dynamic linker load commands are passed to the subprocess that we spawn to create
the MIME type property list.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (152554 => 152555)
--- trunk/Source/WebKit2/ChangeLog 2013-07-10 23:56:42 UTC (rev 152554)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-11 00:13:57 UTC (rev 152555)
@@ -1,3 +1,14 @@
+2013-07-10 Mark Rowe <[email protected]>
+
+ <rdar://problem/14395759> PluginProcess sometimes logs an error about being unable to load WebKit2.framework.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::createPropertyListFile): Ensure that any environment variables
+ specified in dynamic linker load commands are passed to the subprocess that we spawn to create
+ the MIME type property list.
+
2013-07-10 Brady Eidson <[email protected]>
Some Java plugin instances can deadlock with the WebProcess on NPP_Destroy.
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (152554 => 152555)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2013-07-10 23:56:42 UTC (rev 152554)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2013-07-11 00:13:57 UTC (rev 152555)
@@ -28,6 +28,7 @@
#if ENABLE(PLUGIN_PROCESS)
+#import "DynamicLinkerEnvironmentExtractor.h"
#import "EnvironmentVariables.h"
#import "PluginProcessCreationParameters.h"
#import "PluginProcessMessages.h"
@@ -35,6 +36,8 @@
#import <WebCore/FileSystem.h>
#import <WebCore/KURL.h>
#import <WebCore/RuntimeApplicationChecks.h>
+#import <crt_externs.h>
+#import <mach-o/dyld.h>
#import <spawn.h>
#import <wtf/text/CString.h>
@@ -89,6 +92,9 @@
posix_spawnattr_setbinpref_np(&attr, 1, cpuTypes, &outCount);
EnvironmentVariables environmentVariables;
+
+ DynamicLinkerEnvironmentExtractor environmentExtractor([[NSBundle mainBundle] executablePath], _NSGetMachExecuteHeader()->cputype);
+ environmentExtractor.getExtractedEnvironmentVariables(environmentVariables);
// To make engineering builds work, if the path is outside of /System set up
// DYLD_FRAMEWORK_PATH to pick up other frameworks, but don't do it for the
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
