summaryrefslogtreecommitdiff
path: root/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-09-10 19:10:20 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-09-10 19:10:20 +0200
commit284837daa07b29d6a63a748544a90b1f5842ac5c (patch)
treeecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
parent2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff)
downloadqtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp')
-rw-r--r--Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
index 0f036bb46..f325eb6ac 100644
--- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
@@ -41,6 +41,7 @@ void PluginProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder)
{
encoder->encode(pluginPath);
encoder->encode(supportsAsynchronousPluginInitialization);
+ encoder->encode(terminationTimeout);
#if PLATFORM(MAC)
encoder->encode(parentProcessName);
@@ -54,7 +55,8 @@ bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder,
return false;
if (!decoder->decode(result.supportsAsynchronousPluginInitialization))
return false;
-
+ if (!decoder->decode(result.terminationTimeout))
+ return false;
#if PLATFORM(MAC)
if (!decoder->decode(result.parentProcessName))
return false;