From 32ea33253afbbdefd2680aa95ab5f57455272ae7 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Fri, 30 Nov 2012 16:58:06 +0100
Subject: Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601
 (http://svn.webkit.org/repository/webkit/trunk@136242)

Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split

Extra fixes will be cherry-picked.

Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp | 3 +++
 1 file changed, 3 insertions(+)

(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 f53c26e6b..f5e5101ea 100644
--- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
@@ -40,6 +40,7 @@ PluginProcessCreationParameters::PluginProcessCreationParameters()
 void PluginProcessCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const
 {
     encoder << pluginPath;
+    encoder.encodeEnum(processType);
     encoder << supportsAsynchronousPluginInitialization;
     encoder << minimumLifetime;
     encoder << terminationTimeout;
@@ -55,6 +56,8 @@ bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder,
 {
     if (!decoder->decode(result.pluginPath))
         return false;
+    if (!decoder->decodeEnum(result.processType))
+        return false;
     if (!decoder->decode(result.supportsAsynchronousPluginInitialization))
         return false;
     if (!decoder->decode(result.minimumLifetime))
-- 
cgit v1.2.1