Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 17 insertions, 32 deletions

diff --git a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
index 9c142d8a8..61237be7a 100644
--- a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
+++ b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
@@ -27,24 +27,27 @@
 #include "WebConnectionToUIProcess.h"
 
 #include "InjectedBundleUserMessageCoders.h"
-#include "WebConnectionMessageKinds.h"
+#include "WebConnectionMessages.h"
 #include "WebProcess.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
-PassRefPtr<WebConnectionToUIProcess> WebConnectionToUIProcess::create(WebProcess* process, CoreIPC::Connection::Identifier connectionIdentifier, RunLoop* runLoop)
+PassRefPtr<WebConnectionToUIProcess> WebConnectionToUIProcess::create(WebProcess* process)
 {
-    return adoptRef(new WebConnectionToUIProcess(process, connectionIdentifier, runLoop));
+    return adoptRef(new WebConnectionToUIProcess(process));
 }
 
-WebConnectionToUIProcess::WebConnectionToUIProcess(WebProcess* process, CoreIPC::Connection::Identifier connectionIdentifier, RunLoop* runLoop)
-    : WebConnection(CoreIPC::Connection::createClientConnection(connectionIdentifier, this, runLoop))
-    , m_process(process)
+WebConnectionToUIProcess::WebConnectionToUIProcess(WebProcess* process)
+    : m_process(process)
 {
-    m_connection->setDidCloseOnConnectionWorkQueueCallback(ChildProcess::didCloseOnConnectionWorkQueue);
-    m_connection->setShouldExitOnSyncMessageSendFailure(true);
+    m_process->addMessageReceiver(Messages::WebConnection::messageReceiverName(), this);
+}
+
+void WebConnectionToUIProcess::invalidate()
+{
+    m_process = 0;
 }
 
 // WebConnection
@@ -60,37 +63,19 @@ bool WebConnectionToUIProcess::decodeMessageBody(CoreIPC::ArgumentDecoder& decod
     return decoder.decode(messageBodyDecoder);
 }
 
-// CoreIPC::Connection::Client
-void WebConnectionToUIProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
-{
-    if (messageID.is<CoreIPC::MessageClassWebConnection>()) {
-        didReceiveWebConnectionMessage(connection, messageID, decoder);
-        return;
-    }
-
-    m_process->didReceiveMessage(connection, messageID, decoder);
-}
-
-void WebConnectionToUIProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
-{
-    m_process->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
-}
-
-void WebConnectionToUIProcess::didClose(CoreIPC::Connection* connection)
+CoreIPC::Connection* WebConnectionToUIProcess::connection() const
 {
-    m_process->didClose(connection);
+    return m_process->connection();
 }
 
-void WebConnectionToUIProcess::didReceiveInvalidMessage(CoreIPC::Connection* connection, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName)
+uint64_t WebConnectionToUIProcess::destinationID() const
 {
-    m_process->didReceiveInvalidMessage(connection, messageReceiverName, messageName);
+    return 0;
 }
 
-#if PLATFORM(WIN)
-Vector<HWND> WebConnectionToUIProcess::windowsToReceiveSentMessagesWhileWaitingForSyncReply()
+bool WebConnectionToUIProcess::hasValidConnection() const
 {
-    return m_process->windowsToReceiveSentMessagesWhileWaitingForSyncReply();
+    return m_process;
 }
-#endif
 
 } // namespace WebKit