From 43a42f108af6bcbd91f2672731c3047c26213af1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 Oct 2012 15:40:17 +0200 Subject: Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067) New snapshot that fixes build without QtWidgets --- .../WebProcess/Plugins/PluginProcessConnection.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp') diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp index fdb7e5e1f..fcfb249ad 100644 --- a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp +++ b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp @@ -87,28 +87,28 @@ void PluginProcessConnection::removePluginProxy(PluginProxy* plugin) m_pluginProcessConnectionManager->removePluginProcessConnection(this); } -void PluginProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments) +void PluginProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder) { - ASSERT(arguments->destinationID()); + ASSERT(decoder.destinationID()); - PluginProxy* pluginProxy = m_plugins.get(arguments->destinationID()); + PluginProxy* pluginProxy = m_plugins.get(decoder.destinationID()); if (!pluginProxy) return; - pluginProxy->didReceivePluginProxyMessage(connection, messageID, arguments); + pluginProxy->didReceivePluginProxyMessage(connection, messageID, decoder); } -void PluginProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, OwnPtr& reply) +void PluginProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr& replyEncoder) { if (messageID.is()) { - m_npRemoteObjectMap->didReceiveSyncMessage(connection, messageID, arguments, reply); + m_npRemoteObjectMap->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder); return; } - uint64_t destinationID = arguments->destinationID(); + uint64_t destinationID = decoder.destinationID(); if (!destinationID) { - didReceiveSyncPluginProcessConnectionMessage(connection, messageID, arguments, reply); + didReceiveSyncPluginProcessConnectionMessage(connection, messageID, decoder, replyEncoder); return; } @@ -116,7 +116,7 @@ void PluginProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connect if (!pluginProxy) return; - pluginProxy->didReceiveSyncPluginProxyMessage(connection, messageID, arguments, reply); + pluginProxy->didReceiveSyncPluginProxyMessage(connection, messageID, decoder, replyEncoder); } void PluginProcessConnection::didClose(CoreIPC::Connection*) -- cgit v1.2.1