summaryrefslogtreecommitdiff
path: root/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm')
-rw-r--r--Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm b/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
index 732cff83a..45b56b925 100644
--- a/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
+++ b/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
@@ -116,8 +116,13 @@ int PluginProcessMain(const CommandLine& commandLine)
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
- // Initialize the shim.
+#if defined(__i386__)
+ // Initialize the shim for 32-bit only.
PluginProcess::shared().initializeShim();
+#endif
+
+ // Initialize Cocoa overrides.
+ PluginProcess::shared().initializeCocoaOverrides();
// Initialize the plug-in process connection.
PluginProcess::shared().initialize(CoreIPC::Connection::Identifier(serverPort), RunLoop::main());