Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 6 insertions, 16 deletions

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