From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp') diff --git a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp index c2c6e2455..e8e08500f 100644 --- a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp +++ b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp @@ -27,7 +27,6 @@ #include "WebConnectionToWebProcess.h" #include "WebConnectionMessages.h" -#include "WebContextUserMessageCoders.h" #include "WebProcessProxy.h" namespace WebKit { @@ -40,25 +39,26 @@ PassRefPtr WebConnectionToWebProcess::create(WebProce WebConnectionToWebProcess::WebConnectionToWebProcess(WebProcessProxy* process) : m_process(process) { - m_process->addMessageReceiver(Messages::WebConnection::messageReceiverName(), this); + m_process->addMessageReceiver(Messages::WebConnection::messageReceiverName(), *this); } void WebConnectionToWebProcess::invalidate() { + m_process->removeMessageReceiver(Messages::WebConnection::messageReceiverName()); + m_process = 0; } // WebConnection -void WebConnectionToWebProcess::encodeMessageBody(CoreIPC::ArgumentEncoder& encoder, APIObject* messageBody) +RefPtr WebConnectionToWebProcess::transformHandlesToObjects(API::Object* object) { - encoder << WebContextUserMessageEncoder(messageBody); + return m_process->transformHandlesToObjects(object); } -bool WebConnectionToWebProcess::decodeMessageBody(CoreIPC::ArgumentDecoder& decoder, RefPtr& messageBody) +RefPtr WebConnectionToWebProcess::transformObjectsToHandles(API::Object* object) { - WebContextUserMessageDecoder messageBodyDecoder(messageBody, m_process); - return decoder.decode(messageBodyDecoder); + return m_process->transformObjectsToHandles(object); } bool WebConnectionToWebProcess::hasValidConnection() const @@ -66,7 +66,7 @@ bool WebConnectionToWebProcess::hasValidConnection() const return m_process; } -CoreIPC::Connection* WebConnectionToWebProcess::messageSenderConnection() +IPC::Connection* WebConnectionToWebProcess::messageSenderConnection() { return m_process->connection(); } -- cgit v1.2.1