Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp b/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp
index 67dad4829..9ec19d32a 100644
--- a/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp
+++ b/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp
@@ -33,15 +33,15 @@ namespace CoreIPC {
 
 typedef HashMap<String , Vector<uint8_t> > MIMEDataHashMap;
 
-void ArgumentCoder<WebCore::DragData>::encode(ArgumentEncoder* encoder, const DragData& dragData)
+void ArgumentCoder<WebCore::DragData>::encode(ArgumentEncoder& encoder, const DragData& dragData)
 {
-    encoder->encode(dragData.clientPosition());
-    encoder->encode(dragData.globalPosition());
-    encoder->encode((uint64_t)dragData.draggingSourceOperationMask());
-    encoder->encode((uint64_t)dragData.flags());
+    encoder << dragData.clientPosition();
+    encoder << dragData.globalPosition();
+    encoder << (uint64_t)dragData.draggingSourceOperationMask();
+    encoder << (uint64_t)dragData.flags();
 
     bool hasPlatformData = dragData.platformData();
-    encoder->encode(hasPlatformData);
+    encoder << hasPlatformData;
     if (!hasPlatformData)
         return;
 
@@ -54,7 +54,7 @@ void ArgumentCoder<WebCore::DragData>::encode(ArgumentEncoder* encoder, const Dr
         vdata.append((uint8_t*)(bytes.data()), bytes.size());
         map.add(String(formats[i]), vdata);
     }
-    encoder->encode(map);
+    encoder << map;
 }
 
 bool ArgumentCoder<WebCore::DragData>::decode(ArgumentDecoder* decoder, DragData& dragData)