diff options
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); } |