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/Shared/Plugins/PluginProcessCreationParameters.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp') 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; -- cgit v1.2.1