Clean up some of the IPC code

https://bugs.webkit.org/show_bug.cgi?id=140057 Reviewed by Antti Koivisto. Use std::mutex instead of WTF::Mutex. Change a couple of pointers to references in the connection client. * DatabaseProcess/DatabaseProcess.cpp: (WebKit::DatabaseProcess::didClose): (WebKit::DatabaseProcess::didReceiveInvalidMessage): * DatabaseProcess/DatabaseProcess.h: * DatabaseProcess/DatabaseToWebProcessConnection.cpp: (WebKit::DatabaseToWebProcessConnection::didClose): (WebKit::DatabaseToWebProcessConnection::didReceiveInvalidMessage): * DatabaseProcess/DatabaseToWebProcessConnection.h: * NetworkProcess/NetworkConnectionToWebProcess.cpp: (WebKit::NetworkConnectionToWebProcess::didClose): (WebKit::NetworkConnectionToWebProcess::didReceiveInvalidMessage): * NetworkProcess/NetworkConnectionToWebProcess.h: * NetworkProcess/NetworkProcess.cpp: (WebKit::NetworkProcess::didClose): (WebKit::NetworkProcess::didReceiveInvalidMessage): * NetworkProcess/NetworkProcess.h: * Platform/IPC/Connection.cpp: (IPC::Connection::sendMessage): (IPC::Connection::waitForMessage): (IPC::Connection::connectionDidClose): (IPC::Connection::sendOutgoingMessages): (IPC::Connection::dispatchDidReceiveInvalidMessage): (IPC::Connection::enqueueIncomingMessage): (IPC::Connection::dispatchMessage): (IPC::Connection::dispatchOneMessage): * Platform/IPC/Connection.h: * PluginProcess/PluginProcess.cpp: (WebKit::PluginProcess::didClose): (WebKit::PluginProcess::didReceiveInvalidMessage): * PluginProcess/PluginProcess.h: * PluginProcess/WebProcessConnection.cpp: (WebKit::WebProcessConnection::didClose): (WebKit::WebProcessConnection::didReceiveInvalidMessage): * PluginProcess/WebProcessConnection.h: * UIProcess/Databases/DatabaseProcessProxy.cpp: (WebKit::DatabaseProcessProxy::didClose): (WebKit::DatabaseProcessProxy::didReceiveInvalidMessage): * UIProcess/Databases/DatabaseProcessProxy.h: * UIProcess/Network/NetworkProcessProxy.cpp: (WebKit::NetworkProcessProxy::didClose): (WebKit::NetworkProcessProxy::didReceiveInvalidMessage): * UIProcess/Network/NetworkProcessProxy.h: * UIProcess/Plugins/PluginProcessProxy.cpp: (WebKit::PluginProcessProxy::didClose): (WebKit::PluginProcessProxy::didReceiveInvalidMessage): * UIProcess/Plugins/PluginProcessProxy.h: * UIProcess/WebProcessProxy.cpp: (WebKit::WebProcessProxy::didClose): (WebKit::WebProcessProxy::didReceiveInvalidMessage): * UIProcess/WebProcessProxy.h: * WebProcess/Databases/WebToDatabaseProcessConnection.cpp: (WebKit::WebToDatabaseProcessConnection::didClose): (WebKit::WebToDatabaseProcessConnection::didReceiveInvalidMessage): * WebProcess/Databases/WebToDatabaseProcessConnection.h: * WebProcess/Network/NetworkProcessConnection.cpp: (WebKit::NetworkProcessConnection::didClose): (WebKit::NetworkProcessConnection::didReceiveInvalidMessage): * WebProcess/Network/NetworkProcessConnection.h: * WebProcess/Plugins/PluginProcessConnection.cpp: (WebKit::PluginProcessConnection::didClose): (WebKit::PluginProcessConnection::didReceiveInvalidMessage): * WebProcess/Plugins/PluginProcessConnection.h: * WebProcess/WebPage/WebInspector.h: * WebProcess/WebPage/WebInspectorUI.h: * WebProcess/WebProcess.cpp: (WebKit::WebProcess::didClose): (WebKit::WebProcess::didReceiveInvalidMessage): * WebProcess/WebProcess.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@177875 268f45cc-cd09-0410-ab3c-d52691b4dbfc
zhaodm · Jan 4, 2015 · 30e768b · 30e768b
1 parent 69f40e2
commit 30e768b
Show file tree

Hide file tree

Showing 33 changed files with 151 additions and 73 deletions.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,81 @@
+2015-01-04  Anders Carlsson  <[email protected]>
+
+        Clean up some of the IPC code
+        https://bugs.webkit.org/show_bug.cgi?id=140057
+
+        Reviewed by Antti Koivisto.
+
+        Use std::mutex instead of WTF::Mutex. Change a couple of pointers to references in the connection client.
+
+        * DatabaseProcess/DatabaseProcess.cpp:
+        (WebKit::DatabaseProcess::didClose):
+        (WebKit::DatabaseProcess::didReceiveInvalidMessage):
+        * DatabaseProcess/DatabaseProcess.h:
+        * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+        (WebKit::DatabaseToWebProcessConnection::didClose):
+        (WebKit::DatabaseToWebProcessConnection::didReceiveInvalidMessage):
+        * DatabaseProcess/DatabaseToWebProcessConnection.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::didClose):
+        (WebKit::NetworkConnectionToWebProcess::didReceiveInvalidMessage):
+        * NetworkProcess/NetworkConnectionToWebProcess.h:
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::didClose):
+        (WebKit::NetworkProcess::didReceiveInvalidMessage):
+        * NetworkProcess/NetworkProcess.h:
+        * Platform/IPC/Connection.cpp:
+        (IPC::Connection::sendMessage):
+        (IPC::Connection::waitForMessage):
+        (IPC::Connection::connectionDidClose):
+        (IPC::Connection::sendOutgoingMessages):
+        (IPC::Connection::dispatchDidReceiveInvalidMessage):
+        (IPC::Connection::enqueueIncomingMessage):
+        (IPC::Connection::dispatchMessage):
+        (IPC::Connection::dispatchOneMessage):
+        * Platform/IPC/Connection.h:
+        * PluginProcess/PluginProcess.cpp:
+        (WebKit::PluginProcess::didClose):
+        (WebKit::PluginProcess::didReceiveInvalidMessage):
+        * PluginProcess/PluginProcess.h:
+        * PluginProcess/WebProcessConnection.cpp:
+        (WebKit::WebProcessConnection::didClose):
+        (WebKit::WebProcessConnection::didReceiveInvalidMessage):
+        * PluginProcess/WebProcessConnection.h:
+        * UIProcess/Databases/DatabaseProcessProxy.cpp:
+        (WebKit::DatabaseProcessProxy::didClose):
+        (WebKit::DatabaseProcessProxy::didReceiveInvalidMessage):
+        * UIProcess/Databases/DatabaseProcessProxy.h:
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::didClose):
+        (WebKit::NetworkProcessProxy::didReceiveInvalidMessage):
+        * UIProcess/Network/NetworkProcessProxy.h:
+        * UIProcess/Plugins/PluginProcessProxy.cpp:
+        (WebKit::PluginProcessProxy::didClose):
+        (WebKit::PluginProcessProxy::didReceiveInvalidMessage):
+        * UIProcess/Plugins/PluginProcessProxy.h:
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::didClose):
+        (WebKit::WebProcessProxy::didReceiveInvalidMessage):
+        * UIProcess/WebProcessProxy.h:
+        * WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
+        (WebKit::WebToDatabaseProcessConnection::didClose):
+        (WebKit::WebToDatabaseProcessConnection::didReceiveInvalidMessage):
+        * WebProcess/Databases/WebToDatabaseProcessConnection.h:
+        * WebProcess/Network/NetworkProcessConnection.cpp:
+        (WebKit::NetworkProcessConnection::didClose):
+        (WebKit::NetworkProcessConnection::didReceiveInvalidMessage):
+        * WebProcess/Network/NetworkProcessConnection.h:
+        * WebProcess/Plugins/PluginProcessConnection.cpp:
+        (WebKit::PluginProcessConnection::didClose):
+        (WebKit::PluginProcessConnection::didReceiveInvalidMessage):
+        * WebProcess/Plugins/PluginProcessConnection.h:
+        * WebProcess/WebPage/WebInspector.h:
+        * WebProcess/WebPage/WebInspectorUI.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::didClose):
+        (WebKit::WebProcess::didReceiveInvalidMessage):
+        * WebProcess/WebProcess.h:
+
 2015-01-01  Sam Weinig  <[email protected]>
 
         Remove GroupSettings

diff --git a/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp b/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
@@ -75,7 +75,7 @@ bool DatabaseProcess::shouldTerminate()
     return true;
 }
 
-void DatabaseProcess::didClose(IPC::Connection*)
+void DatabaseProcess::didClose(IPC::Connection&)
 {
     RunLoop::current().stop();
 }
@@ -91,7 +91,7 @@ void DatabaseProcess::didReceiveMessage(IPC::Connection* connection, IPC::Messag
     }
 }
 
-void DatabaseProcess::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
+void DatabaseProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
 {
     RunLoop::current().stop();
 }

diff --git a/Source/WebKit2/DatabaseProcess/DatabaseProcess.h b/Source/WebKit2/DatabaseProcess/DatabaseProcess.h
@@ -80,8 +80,8 @@ class DatabaseProcess : public ChildProcess, public WebOriginDataManagerSuppleme
 
     // IPC::Connection::Client
     virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
-    virtual void didClose(IPC::Connection*) override;
-    virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
+    virtual void didClose(IPC::Connection&) override;
+    virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
     void didReceiveDatabaseProcessMessage(IPC::Connection*, IPC::MessageDecoder&);
 
     // Message Handlers

diff --git a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp
@@ -81,14 +81,14 @@ void DatabaseToWebProcessConnection::didReceiveSyncMessage(IPC::Connection* conn
     ASSERT_NOT_REACHED();
 }
 
-void DatabaseToWebProcessConnection::didClose(IPC::Connection*)
+void DatabaseToWebProcessConnection::didClose(IPC::Connection&)
 {
     // The WebProcess has disconnected, close all of the connections associated with it
     while (!m_idbConnections.isEmpty())
         removeDatabaseProcessIDBConnection(m_idbConnections.begin()->key);
 }
 
-void DatabaseToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
+void DatabaseToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
 {
 
 }

diff --git a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h
@@ -49,8 +49,8 @@ class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessCon
     // IPC::Connection::Client
     virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
     virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
-    virtual void didClose(IPC::Connection*) override;
-    virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
+    virtual void didClose(IPC::Connection&) override;
+    virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
     void didReceiveDatabaseToWebProcessConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
 
     // IPC::MessageSender

diff --git a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp
@@ -95,7 +95,7 @@ void NetworkConnectionToWebProcess::didReceiveSyncMessage(IPC::Connection* conne
     ASSERT_NOT_REACHED();
 }
 
-void NetworkConnectionToWebProcess::didClose(IPC::Connection*)
+void NetworkConnectionToWebProcess::didClose(IPC::Connection&)
 {
     // Protect ourself as we might be otherwise be deleted during this function.
     Ref<NetworkConnectionToWebProcess> protector(*this);
@@ -110,7 +110,7 @@ void NetworkConnectionToWebProcess::didClose(IPC::Connection*)
     NetworkProcess::shared().removeNetworkConnectionToWebProcess(this);
 }
 
-void NetworkConnectionToWebProcess::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
+void NetworkConnectionToWebProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
 {
 }
 

diff --git a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h
@@ -63,8 +63,8 @@ class NetworkConnectionToWebProcess : public RefCounted<NetworkConnectionToWebPr
     // IPC::Connection::Client
     virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
     virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
-    virtual void didClose(IPC::Connection*);
-    virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName);
+    virtual void didClose(IPC::Connection&);
+    virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName);
 
     // Message handlers.
     void didReceiveNetworkConnectionToWebProcessMessage(IPC::Connection*, IPC::MessageDecoder&);

diff --git a/Source/WebKit2/NetworkProcess/NetworkProcess.cpp b/Source/WebKit2/NetworkProcess/NetworkProcess.cpp
@@ -124,13 +124,13 @@ void NetworkProcess::didReceiveSyncMessage(IPC::Connection* connection, IPC::Mes
     messageReceiverMap().dispatchSyncMessage(connection, decoder, replyEncoder);
 }
 
-void NetworkProcess::didClose(IPC::Connection*)
+void NetworkProcess::didClose(IPC::Connection&)
 {
     // The UIProcess just exited.
     RunLoop::current().stop();
 }
 
-void NetworkProcess::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
+void NetworkProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
 {
     RunLoop::current().stop();
 }

diff --git a/Source/WebKit2/NetworkProcess/NetworkProcess.h b/Source/WebKit2/NetworkProcess/NetworkProcess.h
@@ -97,8 +97,8 @@ class NetworkProcess : public ChildProcess, private DownloadManager::Client {
     // IPC::Connection::Client
     virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
     virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
-    virtual void didClose(IPC::Connection*) override;
-    virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
+    virtual void didClose(IPC::Connection&) override;
+    virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
 
     // DownloadManager::Client
     virtual void didCreateDownload() override;

diff --git a/Source/WebKit2/Platform/IPC/Connection.cpp b/Source/WebKit2/Platform/IPC/Connection.cpp
@@ -376,7 +376,7 @@ bool Connection::sendMessage(std::unique_ptr<MessageEncoder> encoder, unsigned m
         encoder->setShouldDispatchMessageWhenWaitingForSyncReply(true);
 
     {
-        MutexLocker locker(m_outgoingMessagesLock);
+        std::lock_guard<std::mutex> lock(m_outgoingMessagesMutex);
         m_outgoingMessages.append(WTF::move(encoder));
     }
 
@@ -396,7 +396,7 @@ std::unique_ptr<MessageDecoder> Connection::waitForMessage(StringReference messa
 
     // First, check if this message is already in the incoming messages queue.
     {
-        MutexLocker locker(m_incomingMessagesLock);
+        std::lock_guard<std::mutex> lock(m_incomingMessagesMutex);
 
         for (auto it = m_incomingMessages.begin(), end = m_incomingMessages.end(); it != end; ++it) {
             std::unique_ptr<MessageDecoder>& message = *it;
@@ -724,7 +724,7 @@ void Connection::connectionDidClose()
         Client* client = connection->m_client;
         connection->m_client = nullptr;
 
-        client->didClose(connection.get());
+        client->didClose(*connection);
     });
 }
 
@@ -742,7 +742,7 @@ void Connection::sendOutgoingMessages()
         std::unique_ptr<MessageEncoder> message;
 
         {
-            MutexLocker locker(m_outgoingMessagesLock);
+            std::lock_guard<std::mutex> lock(m_outgoingMessagesMutex);
             if (m_outgoingMessages.isEmpty())
                 break;
             message = m_outgoingMessages.takeFirst();
@@ -783,7 +783,7 @@ void Connection::dispatchDidReceiveInvalidMessage(const CString& messageReceiver
     if (!m_client)
         return;
 
-    m_client->didReceiveInvalidMessage(this, StringReference(messageReceiverNameString.data(), messageReceiverNameString.length()), StringReference(messageNameString.data(), messageNameString.length()));
+    m_client->didReceiveInvalidMessage(*this, StringReference(messageReceiverNameString.data(), messageReceiverNameString.length()), StringReference(messageNameString.data(), messageNameString.length()));
 }
 
 void Connection::didFailToSendSyncMessage()
@@ -797,7 +797,7 @@ void Connection::didFailToSendSyncMessage()
 void Connection::enqueueIncomingMessage(std::unique_ptr<MessageDecoder> incomingMessage)
 {
     {
-        MutexLocker locker(m_incomingMessagesLock);
+        std::lock_guard<std::mutex> lock(m_incomingMessagesMutex);
         m_incomingMessages.append(WTF::move(incomingMessage));
     }
 
@@ -836,7 +836,7 @@ void Connection::dispatchMessage(std::unique_ptr<MessageDecoder> message)
         m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount--;
 
     if (m_didReceiveInvalidMessage && m_client)
-        m_client->didReceiveInvalidMessage(this, message->messageReceiverName(), message->messageName());
+        m_client->didReceiveInvalidMessage(*this, message->messageReceiverName(), message->messageName());
 
     m_didReceiveInvalidMessage = oldDidReceiveInvalidMessage;
 }
@@ -846,7 +846,7 @@ void Connection::dispatchOneMessage()
     std::unique_ptr<MessageDecoder> message;
 
     {
-        MutexLocker locker(m_incomingMessagesLock);
+        std::lock_guard<std::mutex> lock(m_incomingMessagesMutex);
         if (m_incomingMessages.isEmpty())
             return;
 

diff --git a/Source/WebKit2/Platform/IPC/Connection.h b/Source/WebKit2/Platform/IPC/Connection.h
@@ -76,7 +76,7 @@ enum WaitForMessageFlags {
     // Use this to make waitForMessage be interrupted immediately by any incoming sync messages.
     InterruptWaitingIfSyncMessageArrives = 1 << 0,
 };
-    
+
 #define MESSAGE_CHECK_BASE(assertion, connection) do \
     if (!(assertion)) { \
         ASSERT(assertion); \
@@ -89,8 +89,8 @@ class Connection : public ThreadSafeRefCounted<Connection> {
 public:
     class Client : public MessageReceiver {
     public:
-        virtual void didClose(Connection*) = 0;
-        virtual void didReceiveInvalidMessage(Connection*, StringReference messageReceiverName, StringReference messageName) = 0;
+        virtual void didClose(Connection&) = 0;
+        virtual void didReceiveInvalidMessage(Connection&, StringReference messageReceiverName, StringReference messageName) = 0;
 
     protected:
         virtual ~Client() { }
@@ -251,11 +251,11 @@ class Connection : public ThreadSafeRefCounted<Connection> {
     bool m_didReceiveInvalidMessage;
 
     // Incoming messages.
-    Mutex m_incomingMessagesLock;
+    std::mutex m_incomingMessagesMutex;
     Deque<std::unique_ptr<MessageDecoder>> m_incomingMessages;
 
     // Outgoing messages.
-    Mutex m_outgoingMessagesLock;
+    std::mutex m_outgoingMessagesMutex;
     Deque<std::unique_ptr<MessageEncoder>> m_outgoingMessages;
 
     std::condition_variable m_waitForMessageCondition;

diff --git a/Source/WebKit2/PluginProcess/PluginProcess.cpp b/Source/WebKit2/PluginProcess/PluginProcess.cpp
@@ -125,14 +125,14 @@ void PluginProcess::didReceiveMessage(IPC::Connection* connection, IPC::MessageD
     didReceivePluginProcessMessage(connection, decoder);
 }
 
-void PluginProcess::didClose(IPC::Connection*)
+void PluginProcess::didClose(IPC::Connection&)
 {
     // The UI process has crashed, just go ahead and quit.
     // FIXME: If the plug-in is spinning in the main loop, we'll never get this message.
     stopRunLoop();
 }
 
-void PluginProcess::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
+void PluginProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
 {
 }
 

diff --git a/Source/WebKit2/PluginProcess/PluginProcess.h b/Source/WebKit2/PluginProcess/PluginProcess.h
@@ -89,8 +89,8 @@ class PluginProcess : public ChildProcess, private WebCore::AudioHardwareListene
 
     // IPC::Connection::Client
     virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
-    virtual void didClose(IPC::Connection*) override;
-    virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
+    virtual void didClose(IPC::Connection&) override;
+    virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
 
     // Message handlers.
     void didReceivePluginProcessMessage(IPC::Connection*, IPC::MessageDecoder&);

diff --git a/Source/WebKit2/PluginProcess/WebProcessConnection.cpp b/Source/WebKit2/PluginProcess/WebProcessConnection.cpp
@@ -164,7 +164,7 @@ void WebProcessConnection::didReceiveSyncMessage(IPC::Connection* connection, IP
     pluginControllerProxy->didReceiveSyncPluginControllerProxyMessage(connection, decoder, replyEncoder);
 }
 
-void WebProcessConnection::didClose(IPC::Connection*)
+void WebProcessConnection::didClose(IPC::Connection&)
 {
     // The web process crashed. Destroy all the plug-in controllers. Destroying the last plug-in controller
     // will cause the web process connection itself to be destroyed.
@@ -200,7 +200,7 @@ void WebProcessConnection::destroyPlugin(uint64_t pluginInstanceID, bool asynchr
     destroyPluginControllerProxy(pluginControllerProxy);
 }
 
-void WebProcessConnection::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
+void WebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
 {
     // FIXME: Implement.
 }

diff --git a/Source/WebKit2/PluginProcess/WebProcessConnection.h b/Source/WebKit2/PluginProcess/WebProcessConnection.h
@@ -67,8 +67,8 @@ class WebProcessConnection : public RefCounted<WebProcessConnection>, IPC::Conne
     // IPC::Connection::Client
     virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
     virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
-    virtual void didClose(IPC::Connection*);
-    virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName);
+    virtual void didClose(IPC::Connection&);
+    virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName);
 
     // Message handlers.
     void didReceiveWebProcessConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);

diff --git a/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp b/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp
@@ -94,7 +94,7 @@ void DatabaseProcessProxy::getDatabaseProcessConnection(PassRefPtr<Messages::Web
     connection()->send(Messages::DatabaseProcess::CreateDatabaseToWebProcessConnection(), 0, IPC::DispatchMessageEvenWhenWaitingForSyncReply);
 }
 
-void DatabaseProcessProxy::didClose(IPC::Connection*)
+void DatabaseProcessProxy::didClose(IPC::Connection&)
 {
     // The database process must have crashed or exited, so send any pending sync replies we might have.
     while (!m_pendingConnectionReplies.isEmpty()) {
@@ -113,7 +113,7 @@ void DatabaseProcessProxy::didClose(IPC::Connection*)
     m_processPool->databaseProcessCrashed(this);
 }
 
-void DatabaseProcessProxy::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
+void DatabaseProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
 {
 }
 

diff --git a/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h b/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h
@@ -54,8 +54,8 @@ class DatabaseProcessProxy : public ChildProcessProxy {
 
     // IPC::Connection::Client
     virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
-    virtual void didClose(IPC::Connection*) override;
-    virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
+    virtual void didClose(IPC::Connection&) override;
+    virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
 
     void didReceiveDatabaseProcessProxyMessage(IPC::Connection*, IPC::MessageDecoder&);