diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
| commit | 88a04ac016f57c2d78e714682445dff2e7db4ade (patch) | |
| tree | a48ca81ee3b29953121308168db22532d5b57fe2 /Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp | |
| parent | 284837daa07b29d6a63a748544a90b1f5842ac5c (diff) | |
| download | qtwebkit-88a04ac016f57c2d78e714682445dff2e7db4ade.tar.gz | |
Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)
This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future
Diffstat (limited to 'Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp index f325eb6ac..8d3950a4c 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(minimumLifetime); encoder->encode(terminationTimeout); #if PLATFORM(MAC) @@ -55,6 +56,8 @@ bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, return false; if (!decoder->decode(result.supportsAsynchronousPluginInitialization)) return false; + if (!decoder->decode(result.minimumLifetime)) + return false; if (!decoder->decode(result.terminationTimeout)) return false; #if PLATFORM(MAC) |