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

diff --git a/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp b/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp
index 9ec19d32a..44c855b6b 100644
--- a/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp
+++ b/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp
@@ -57,29 +57,29 @@ void ArgumentCoder<WebCore::DragData>::encode(ArgumentEncoder& encoder, const Dr
     encoder << map;
 }
 
-bool ArgumentCoder<WebCore::DragData>::decode(ArgumentDecoder* decoder, DragData& dragData)
+bool ArgumentCoder<WebCore::DragData>::decode(ArgumentDecoder& decoder, DragData& dragData)
 {
     IntPoint clientPosition;
     IntPoint globalPosition;
     uint64_t sourceOperationMask;
     uint64_t flags;
-    if (!decoder->decode(clientPosition))
+    if (!decoder.decode(clientPosition))
         return false;
-    if (!decoder->decode(globalPosition))
+    if (!decoder.decode(globalPosition))
         return false;
-    if (!decoder->decode(sourceOperationMask))
+    if (!decoder.decode(sourceOperationMask))
         return false;
-    if (!decoder->decode(flags))
+    if (!decoder.decode(flags))
         return false;
 
     bool hasPlatformData;
-    if (!decoder->decodeBool(hasPlatformData))
+    if (!decoder.decode(hasPlatformData))
         return false;
 
     QMimeData* mimeData = 0;
     if (hasPlatformData) {
         MIMEDataHashMap map;
-        if (!decoder->decode(map))
+        if (!decoder.decode(map))
             return false;
 
         mimeData = new QMimeData;