diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebKit2/PluginProcess/PluginProcess.cpp | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebKit2/PluginProcess/PluginProcess.cpp')
| -rw-r--r-- | Source/WebKit2/PluginProcess/PluginProcess.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebKit2/PluginProcess/PluginProcess.cpp b/Source/WebKit2/PluginProcess/PluginProcess.cpp index 759628504..6f868bbf8 100644 --- a/Source/WebKit2/PluginProcess/PluginProcess.cpp +++ b/Source/WebKit2/PluginProcess/PluginProcess.cpp @@ -65,8 +65,6 @@ using namespace WebCore; namespace WebKit { -static const double shutdownTimeout = 15.0; - PluginProcess& PluginProcess::shared() { DEFINE_STATIC_LOCAL(PluginProcess, pluginProcess, ()); @@ -74,8 +72,7 @@ PluginProcess& PluginProcess::shared() } PluginProcess::PluginProcess() - : ChildProcess(shutdownTimeout) - , m_supportsAsynchronousPluginInitialization(false) + : m_supportsAsynchronousPluginInitialization(false) #if PLATFORM(MAC) , m_compositingRenderServerPort(MACH_PORT_NULL) #endif @@ -162,6 +159,7 @@ void PluginProcess::initializePluginProcess(const PluginProcessCreationParameter m_pluginPath = parameters.pluginPath; m_supportsAsynchronousPluginInitialization = parameters.supportsAsynchronousPluginInitialization; + setTerminationTimeout(parameters.terminationTimeout); platformInitialize(parameters); } |