From d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 11 Jan 2012 10:03:25 +0100 Subject: Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3 (http://svn.webkit.org/repository/webkit/trunk@104681) --- Source/WebKit2/UIProcess/WebProcessProxy.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Source/WebKit2/UIProcess/WebProcessProxy.cpp') diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.cpp b/Source/WebKit2/UIProcess/WebProcessProxy.cpp index 0c11caa5b..8c99b4efa 100644 --- a/Source/WebKit2/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit2/UIProcess/WebProcessProxy.cpp @@ -117,6 +117,7 @@ void WebProcessProxy::connect() void WebProcessProxy::disconnect() { if (m_connection) { + m_connection->connection()->removeQueueClient(this); m_connection->invalidate(); m_connection = nullptr; } @@ -349,6 +350,12 @@ void WebProcessProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, Cor pageProxy->didReceiveSyncMessage(connection, messageID, arguments, reply); } +void WebProcessProxy::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage) +{ + if (messageID.is()) + didReceiveWebProcessProxyMessageOnConnectionWorkQueue(connection, messageID, arguments, didHandleMessage); +} + void WebProcessProxy::didClose(CoreIPC::Connection*) { // Protect ourselves, as the call to disconnect() below may otherwise cause us @@ -409,7 +416,9 @@ void WebProcessProxy::didFinishLaunching(CoreIPC::Connection::Identifier connect ASSERT(!m_connection); m_connection = WebConnectionToWebProcess::create(this, connectionIdentifier, RunLoop::main()); - + m_connection->connection()->addQueueClient(this); + m_connection->connection()->open(); + for (size_t i = 0; i < m_pendingMessages.size(); ++i) { CoreIPC::Connection::OutgoingMessage& outgoingMessage = m_pendingMessages[i].first; unsigned messageSendFlags = m_pendingMessages[i].second; -- cgit v1.2.1