diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp | |
parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp')
-rw-r--r-- | Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp index c6c87a608..0f036bb46 100644 --- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp +++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp @@ -33,12 +33,14 @@ namespace WebKit { PluginProcessCreationParameters::PluginProcessCreationParameters() + : supportsAsynchronousPluginInitialization(false) { } void PluginProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) const { encoder->encode(pluginPath); + encoder->encode(supportsAsynchronousPluginInitialization); #if PLATFORM(MAC) encoder->encode(parentProcessName); @@ -50,6 +52,8 @@ bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, { if (!decoder->decode(result.pluginPath)) return false; + if (!decoder->decode(result.supportsAsynchronousPluginInitialization)) + return false; #if PLATFORM(MAC) if (!decoder->decode(result.parentProcessName)) |