diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
commit | 43a42f108af6bcbd91f2672731c3047c26213af1 (patch) | |
tree | 7fa092e5f5d873c72f2486a70e26be26f7a38bec /Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp | |
parent | d9cf437c840c6eb7417bdd97e6c40979255d3158 (diff) | |
download | qtwebkit-43a42f108af6bcbd91f2672731c3047c26213af1.tar.gz |
Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)
New snapshot that fixes build without QtWidgets
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp')
-rw-r--r-- | Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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<CoreIPC::ArgumentEncoder>& reply) +void PluginProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder) { if (messageID.is<CoreIPC::MessageClassNPObjectMessageReceiver>()) { - 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*) |