Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 10 insertions, 11 deletions

diff --git a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
index e8f8d2b4a..e1a51f029 100644
--- a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
+++ b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "WebConnectionToUIProcess.h"
 
-#include "InjectedBundleUserMessageCoders.h"
 #include "WebConnectionMessages.h"
 #include "WebProcess.h"
 
@@ -34,33 +33,33 @@ using namespace WebCore;
 
 namespace WebKit {
 
-PassRefPtr<WebConnectionToUIProcess> WebConnectionToUIProcess::create(WebProcess* process)
+Ref<WebConnectionToUIProcess> WebConnectionToUIProcess::create(WebProcess* process)
 {
-    return adoptRef(new WebConnectionToUIProcess(process));
+    return adoptRef(*new WebConnectionToUIProcess(process));
 }
 
 WebConnectionToUIProcess::WebConnectionToUIProcess(WebProcess* process)
     : m_process(process)
 {
-    m_process->addMessageReceiver(Messages::WebConnection::messageReceiverName(), this);
+    m_process->addMessageReceiver(Messages::WebConnection::messageReceiverName(), *this);
 }
 
 void WebConnectionToUIProcess::invalidate()
 {
-    m_process = 0;
+    m_process->removeMessageReceiver(Messages::WebConnection::messageReceiverName());
+    m_process = nullptr;
 }
 
 // WebConnection
 
-void WebConnectionToUIProcess::encodeMessageBody(CoreIPC::ArgumentEncoder& encoder, APIObject* messageBody)
+RefPtr<API::Object> WebConnectionToUIProcess::transformHandlesToObjects(API::Object* object)
 {
-    encoder << InjectedBundleUserMessageEncoder(messageBody);
+    return m_process->transformHandlesToObjects(object);
 }
 
-bool WebConnectionToUIProcess::decodeMessageBody(CoreIPC::ArgumentDecoder& decoder, RefPtr<APIObject>& messageBody)
+RefPtr<API::Object> WebConnectionToUIProcess::transformObjectsToHandles(API::Object* object)
 {
-    InjectedBundleUserMessageDecoder messageBodyDecoder(messageBody);
-    return decoder.decode(messageBodyDecoder);
+    return m_process->transformObjectsToHandles(object);
 }
 
 bool WebConnectionToUIProcess::hasValidConnection() const
@@ -68,7 +67,7 @@ bool WebConnectionToUIProcess::hasValidConnection() const
     return m_process;
 }
 
-CoreIPC::Connection* WebConnectionToUIProcess::messageSenderConnection()
+IPC::Connection* WebConnectionToUIProcess::messageSenderConnection()
 {
     return m_process->parentProcessConnection();
 }