webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebKit2/Platform/IPC/Attachment.cpp b/Source/WebKit2/Platform/IPC/Attachment.cpp
index 9367b1ad2..2c5ce0e7b 100644
--- a/Source/WebKit2/Platform/IPC/Attachment.cpp
+++ b/Source/WebKit2/Platform/IPC/Attachment.cpp
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "Attachment.h"
 
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
+#include "Decoder.h"
+#include "Encoder.h"
 
 namespace IPC {
 
@@ -36,7 +36,7 @@ Attachment::Attachment()
 {
 }
 
-#if OS(DARWIN)
+#if OS(DARWIN) && !USE(UNIX_DOMAIN_SOCKETS)
 Attachment::Attachment(mach_port_name_t port, mach_msg_type_name_t disposition)
     : m_type(MachPortType)
     , m_port(port)
@@ -50,12 +50,12 @@ void Attachment::release()
 }
 #endif
 
-void Attachment::encode(ArgumentEncoder& encoder) const
+void Attachment::encode(Encoder& encoder) const
 {
-    encoder.addAttachment(*this);
+    encoder.addAttachment(WTFMove(*const_cast<Attachment*>(this)));
 }
 
-bool Attachment::decode(ArgumentDecoder& decoder, Attachment& attachment)
+bool Attachment::decode(Decoder& decoder, Attachment& attachment)
 {
     if (!decoder.removeAttachment(attachment))
         return false;