From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- .../Plugins/PluginProcessCreationParameters.cpp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (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 f5e5101ea..0d059a261 100644 --- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp +++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp @@ -39,37 +39,27 @@ PluginProcessCreationParameters::PluginProcessCreationParameters() void PluginProcessCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const { - encoder << pluginPath; encoder.encodeEnum(processType); encoder << supportsAsynchronousPluginInitialization; encoder << minimumLifetime; encoder << terminationTimeout; - #if PLATFORM(MAC) - encoder << parentProcessName; encoder << acceleratedCompositingPort; - encoder << sandboxProfileDirectoryPath; #endif } -bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, PluginProcessCreationParameters& result) +bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, PluginProcessCreationParameters& result) { - if (!decoder->decode(result.pluginPath)) - return false; - if (!decoder->decodeEnum(result.processType)) + if (!decoder.decodeEnum(result.processType)) return false; - if (!decoder->decode(result.supportsAsynchronousPluginInitialization)) + if (!decoder.decode(result.supportsAsynchronousPluginInitialization)) return false; - if (!decoder->decode(result.minimumLifetime)) + if (!decoder.decode(result.minimumLifetime)) return false; - if (!decoder->decode(result.terminationTimeout)) + if (!decoder.decode(result.terminationTimeout)) return false; #if PLATFORM(MAC) - if (!decoder->decode(result.parentProcessName)) - return false; - if (!decoder->decode(result.acceleratedCompositingPort)) - return false; - if (!decoder->decode(result.sandboxProfileDirectoryPath)) + if (!decoder.decode(result.acceleratedCompositingPort)) return false; #endif -- cgit v1.2.1