Title: [128838] trunk/Source/WebKit2
- Revision
- 128838
- Author
- [email protected]
- Date
- 2012-09-17 18:46:56 -0700 (Mon, 17 Sep 2012)
Log Message
Fix the Snow Leopard build.
* PluginProcess/mac/PluginProcessMac.mm:
(WebKit::PluginProcess::platformInitialize):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128837 => 128838)
--- trunk/Source/WebKit2/ChangeLog 2012-09-18 01:37:18 UTC (rev 128837)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-18 01:46:56 UTC (rev 128838)
@@ -1,5 +1,12 @@
2012-09-17 Sam Weinig <[email protected]>
+ Fix the Snow Leopard build.
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::PluginProcess::platformInitialize):
+
+2012-09-17 Sam Weinig <[email protected]>
+
Add experimental code to enter a sandbox for a plug-in.
Based on a patch by Ivan Krstić.
<rdar://problem/11823151>
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (128837 => 128838)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2012-09-18 01:37:18 UTC (rev 128837)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2012-09-18 01:46:56 UTC (rev 128838)
@@ -30,7 +30,6 @@
#if ENABLE(PLUGIN_PROCESS)
#import "NetscapePlugin.h"
-#import "NetscapeSandboxFunctions.h"
#import "PluginProcessShim.h"
#import "PluginProcessProxyMessages.h"
#import "PluginProcessCreationParameters.h"
@@ -40,6 +39,10 @@
#import <objc/runtime.h>
#import <wtf/HashSet.h>
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+#import "NetscapeSandboxFunctions.h"
+#endif
+
namespace WebKit {
static pthread_once_t shouldCallRealDebuggerOnce = PTHREAD_ONCE_INIT;
@@ -263,6 +266,7 @@
m_connection->send(Messages::PluginProcessProxy::SetFullscreenWindowIsShowing(fullscreenWindowIsShowing), 0);
}
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
static void initializeSandbox(const String& pluginPath)
{
RetainPtr<CFStringRef> cfPluginPath = adoptCF(pluginPath.createCFString());
@@ -287,6 +291,7 @@
enterSandbox([profileString.get() UTF8String], 0, 0);
}
+#endif
void PluginProcess::platformInitialize(const PluginProcessCreationParameters& parameters)
{
@@ -300,7 +305,9 @@
WKSetVisibleApplicationName((CFStringRef)applicationName);
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
initializeSandbox(m_pluginPath);
+#endif
}
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
