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, 9 insertions, 9 deletions

diff --git a/Source/WebKit2/WebProcess/Plugins/Plugin.cpp b/Source/WebKit2/WebProcess/Plugins/Plugin.cpp
index f2c6af46c..90e5e76cd 100644
--- a/Source/WebKit2/WebProcess/Plugins/Plugin.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Plugin.cpp
@@ -46,30 +46,30 @@ void Plugin::Parameters::encode(CoreIPC::ArgumentEncoder& encoder) const
 #endif
 }
 
-bool Plugin::Parameters::decode(CoreIPC::ArgumentDecoder* decoder, Parameters& parameters)
+bool Plugin::Parameters::decode(CoreIPC::ArgumentDecoder& decoder, Parameters& parameters)
 {
     String urlString;
-    if (!decoder->decode(urlString))
+    if (!decoder.decode(urlString))
         return false;
     // FIXME: We can't assume that the url passed in here is valid.
     parameters.url = KURL(ParsedURLString, urlString);
 
-    if (!decoder->decode(parameters.names))
+    if (!decoder.decode(parameters.names))
         return false;
-    if (!decoder->decode(parameters.values))
+    if (!decoder.decode(parameters.values))
         return false;
-    if (!decoder->decode(parameters.mimeType))
+    if (!decoder.decode(parameters.mimeType))
         return false;
-    if (!decoder->decode(parameters.isFullFramePlugin))
+    if (!decoder.decode(parameters.isFullFramePlugin))
         return false;
-    if (!decoder->decode(parameters.shouldUseManualLoader))
+    if (!decoder.decode(parameters.shouldUseManualLoader))
         return false;
 #if PLATFORM(MAC)
-    if (!decoder->decodeEnum(parameters.layerHostingMode))
+    if (!decoder.decodeEnum(parameters.layerHostingMode))
         return false;
 #endif
     if (parameters.names.size() != parameters.values.size()) {
-        decoder->markInvalid();
+        decoder.markInvalid();
         return false;
     }