From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp') diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp index 12abf6dc2..7c53b695e 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp +++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp @@ -47,6 +47,8 @@ using namespace WebCore; namespace WebKit { +static const double shutdownTimeout = 15; + PassRefPtr PluginProcessProxy::create(PluginProcessManager* PluginProcessManager, const PluginModuleInfo& pluginInfo) { return adoptRef(new PluginProcessProxy(PluginProcessManager, pluginInfo)); @@ -211,6 +213,8 @@ void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, CoreIPC::Connectio parameters.pluginPath = m_pluginInfo.path; + parameters.terminationTimeout = shutdownTimeout; + platformInitializePluginProcess(parameters); // Initialize the plug-in host process. -- cgit v1.2.1