Changeset 141361 in webkit


Ignore:
Timestamp:
Jan 30, 2013 6:30:09 PM (11 years ago)
Author:
andersca@apple.com
Message:

Remove MessageID from MessageSender
​https://bugs.webkit.org/show_bug.cgi?id=108413

Reviewed by Andreas Kling.

This is another step towards eliminating MessageID.

  • NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::didReceiveMessage):
(WebKit::NetworkConnectionToWebProcess::didReceiveSyncMessage):

  • NetworkProcess/NetworkConnectionToWebProcess.h:

(NetworkConnectionToWebProcess):

  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::didReceiveMessage):
(WebKit::NetworkProcess::didReceiveSyncMessage):

  • NetworkProcess/NetworkProcess.h:

(NetworkProcess):

  • Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::processIncomingMessage):
(CoreIPC::Connection::dispatchSyncMessage):
(CoreIPC::Connection::dispatchMessage):

  • Platform/CoreIPC/Connection.h:

(QueueClient):
(CoreIPC::Connection::waitForAndDispatchImmediately):

  • Platform/CoreIPC/MessageReceiver.h:

(MessageReceiver):
(CoreIPC::MessageReceiver::didReceiveSyncMessage):

  • Platform/CoreIPC/MessageReceiverMap.cpp:

(CoreIPC::MessageReceiverMap::dispatchMessage):
(CoreIPC::MessageReceiverMap::dispatchSyncMessage):

  • Platform/CoreIPC/MessageReceiverMap.h:

(MessageReceiverMap):

  • PluginProcess/PluginProcess.cpp:

(WebKit::PluginProcess::didReceiveMessage):

  • PluginProcess/PluginProcess.h:

(PluginProcess):

  • PluginProcess/WebProcessConnection.cpp:

(WebKit::WebProcessConnection::didReceiveMessage):
(WebKit::WebProcessConnection::didReceiveSyncMessage):

  • PluginProcess/WebProcessConnection.h:

(WebProcessConnection):

  • Scripts/webkit2/messages.py:

(forward_declarations_and_headers):
(generate_message_handler):

  • Scripts/webkit2/messages_unittest.py:
  • Shared/Authentication/AuthenticationManager.cpp:

(WebKit::AuthenticationManager::didReceiveMessage):

  • Shared/Authentication/AuthenticationManager.h:

(AuthenticationManager):

  • Shared/ChildProcessProxy.cpp:

(WebKit::ChildProcessProxy::sendMessage):

  • Shared/ChildProcessProxy.h:

(ChildProcessProxy):
(WebKit::ChildProcessProxy::send):

  • Shared/Network/CustomProtocols/CustomProtocolManager.h:

(CustomProtocolManager):

  • Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:

(WebKit::CustomProtocolManager::didReceiveMessage):

  • Shared/Plugins/NPRemoteObjectMap.cpp:

(WebKit::NPRemoteObjectMap::didReceiveSyncMessage):

  • Shared/Plugins/NPRemoteObjectMap.h:

(NPRemoteObjectMap):

  • Shared/WebConnection.cpp:

(WebKit::WebConnection::didReceiveMessage):

  • Shared/WebConnection.h:

(WebConnection):

  • Shared/mac/SecItemShim.cpp:

(WebKit::SecItemShim::didReceiveMessageOnConnectionWorkQueue):

  • Shared/mac/SecItemShim.h:

(SecItemShim):

  • SharedWorkerProcess/SharedWorkerProcess.cpp:

(WebKit::SharedWorkerProcess::didReceiveMessage):

  • SharedWorkerProcess/SharedWorkerProcess.h:

(SharedWorkerProcess):

  • UIProcess/Downloads/DownloadProxy.cpp:

(WebKit::DownloadProxy::didReceiveMessage):
(WebKit::DownloadProxy::didReceiveSyncMessage):

  • UIProcess/Downloads/DownloadProxy.h:

(DownloadProxy):

  • UIProcess/DrawingAreaProxy.cpp:

(WebKit::DrawingAreaProxy::didReceiveCoordinatedLayerTreeHostProxyMessage):

  • UIProcess/DrawingAreaProxy.h:

(DrawingAreaProxy):

  • UIProcess/DrawingAreaProxyImpl.cpp:

(WebKit::DrawingAreaProxyImpl::didReceiveCoordinatedLayerTreeHostProxyMessage):

  • UIProcess/DrawingAreaProxyImpl.h:
  • UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:

(CustomProtocolManagerProxy):

  • UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:

(WebKit::CustomProtocolManagerProxy::didReceiveMessage):

  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::didReceiveMessage):
(WebKit::NetworkProcessProxy::didReceiveSyncMessage):

  • UIProcess/Network/NetworkProcessProxy.h:

(NetworkProcessProxy):

  • UIProcess/Notifications/WebNotificationManagerProxy.h:

(WebNotificationManagerProxy):

  • UIProcess/Plugins/PluginProcessProxy.cpp:

(WebKit::PluginProcessProxy::didReceiveMessage):

  • UIProcess/Plugins/PluginProcessProxy.h:

(PluginProcessProxy):

  • UIProcess/SharedWorkers/SharedWorkerProcessProxy.cpp:

(WebKit::SharedWorkerProcessProxy::didReceiveMessage):

  • UIProcess/SharedWorkers/SharedWorkerProcessProxy.h:

(SharedWorkerProcessProxy):

  • UIProcess/WebApplicationCacheManagerProxy.cpp:

(WebKit::WebApplicationCacheManagerProxy::didReceiveMessage):

  • UIProcess/WebApplicationCacheManagerProxy.h:

(WebApplicationCacheManagerProxy):

  • UIProcess/WebContext.cpp:

(WebKit::WebContext::dispatchMessage):
(WebKit::WebContext::dispatchSyncMessage):
(WebKit::WebContext::didReceiveMessage):
(WebKit::WebContext::didReceiveSyncMessage):

  • UIProcess/WebContext.h:

(WebContext):

  • UIProcess/WebCookieManagerProxy.cpp:

(WebKit::WebCookieManagerProxy::didReceiveMessage):

  • UIProcess/WebCookieManagerProxy.h:

(WebCookieManagerProxy):

  • UIProcess/WebDatabaseManagerProxy.cpp:

(WebKit::WebDatabaseManagerProxy::didReceiveMessage):

  • UIProcess/WebDatabaseManagerProxy.h:

(WebDatabaseManagerProxy):

  • UIProcess/WebFullScreenManagerProxy.cpp:

(WebKit::WebFullScreenManagerProxy::didReceiveMessage):
(WebKit::WebFullScreenManagerProxy::didReceiveSyncMessage):

  • UIProcess/WebFullScreenManagerProxy.h:

(WebFullScreenManagerProxy):

  • UIProcess/WebGeolocationManagerProxy.h:

(WebGeolocationManagerProxy):

  • UIProcess/WebIconDatabase.h:

(WebIconDatabase):

  • UIProcess/WebKeyValueStorageManagerProxy.h:

(WebKeyValueStorageManagerProxy):

  • UIProcess/WebMediaCacheManagerProxy.h:

(WebMediaCacheManagerProxy):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didReceiveMessage):
(WebKit::WebPageProxy::didReceiveSyncMessage):

  • UIProcess/WebPageProxy.h:

(WebPageProxy):

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::didReceiveMessage):
(WebKit::WebProcessProxy::didReceiveSyncMessage):
(WebKit::WebProcessProxy::didReceiveMessageOnConnectionWorkQueue):

  • UIProcess/WebProcessProxy.h:

(WebProcessProxy):

  • UIProcess/WebResourceCacheManagerProxy.h:

(WebResourceCacheManagerProxy):

  • UIProcess/mac/RemoteLayerTreeHost.h:

(RemoteLayerTreeHost):

  • UIProcess/mac/RemoteLayerTreeHost.mm:

(WebKit::RemoteLayerTreeHost::didReceiveMessage):

  • UIProcess/mac/SecItemShimProxy.cpp:

(WebKit::SecItemShimProxy::didReceiveMessageOnConnectionWorkQueue):

  • UIProcess/mac/SecItemShimProxy.h:

(SecItemShimProxy):

  • WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:

(WebKit::WebApplicationCacheManager::didReceiveMessage):

  • WebProcess/ApplicationCache/WebApplicationCacheManager.h:

(WebApplicationCacheManager):

  • WebProcess/Cookies/WebCookieManager.cpp:

(WebKit::WebCookieManager::didReceiveMessage):

  • WebProcess/Cookies/WebCookieManager.h:

(WebCookieManager):

  • WebProcess/FullScreen/WebFullScreenManager.cpp:

(WebKit::WebFullScreenManager::didReceiveMessage):

  • WebProcess/FullScreen/WebFullScreenManager.h:

(WebFullScreenManager):

  • WebProcess/Geolocation/WebGeolocationManager.h:

(WebGeolocationManager):

  • WebProcess/IconDatabase/WebIconDatabaseProxy.h:

(WebIconDatabaseProxy):

  • WebProcess/MediaCache/WebMediaCacheManager.h:

(WebMediaCacheManager):

  • WebProcess/Network/NetworkProcessConnection.cpp:

(WebKit::NetworkProcessConnection::didReceiveMessage):
(WebKit::NetworkProcessConnection::didReceiveSyncMessage):

  • WebProcess/Network/NetworkProcessConnection.h:

(NetworkProcessConnection):

  • WebProcess/Notifications/WebNotificationManager.h:

(WebNotificationManager):

  • WebProcess/Plugins/PluginProcessConnection.cpp:

(WebKit::PluginProcessConnection::didReceiveMessage):
(WebKit::PluginProcessConnection::didReceiveSyncMessage):

  • WebProcess/Plugins/PluginProcessConnection.h:

(PluginProcessConnection):

  • WebProcess/ResourceCache/WebResourceCacheManager.h:

(WebResourceCacheManager):

  • WebProcess/Storage/WebKeyValueStorageManager.h:

(WebKeyValueStorageManager):

  • WebProcess/WebCoreSupport/WebDatabaseManager.cpp:

(WebKit::WebDatabaseManager::didReceiveMessage):

  • WebProcess/WebCoreSupport/WebDatabaseManager.h:

(WebDatabaseManager):

  • WebProcess/WebPage/DrawingArea.h:

(DrawingArea):

  • WebProcess/WebPage/DrawingAreaImpl.cpp:

(WebKit::DrawingAreaImpl::didReceiveCoordinatedLayerTreeHostMessage):

  • WebProcess/WebPage/DrawingAreaImpl.h:

(DrawingAreaImpl):

  • WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::didReceiveMessageOnConnectionWorkQueue):

  • WebProcess/WebPage/EventDispatcher.h:

(EventDispatcher):

  • WebProcess/WebPage/LayerTreeHost.h:

(LayerTreeHost):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didReceiveMessage):
(WebKit::WebPage::didReceiveSyncMessage):

  • WebProcess/WebPage/WebPage.h:

(WebPage):

  • WebProcess/WebPage/WebPageGroupProxy.h:

(WebPageGroupProxy):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::didReceiveSyncMessage):
(WebKit::WebProcess::didReceiveMessage):
(WebKit::WebProcess::didReceiveMessageOnConnectionWorkQueue):

  • WebProcess/WebProcess.h:

(WebProcess):

Location:
trunk/Source/WebKit2
Files:
97 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r141359 r141361  
     12013-01-30  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove MessageID from MessageSender
     4        https://bugs.webkit.org/show_bug.cgi?id=108413
     5
     6        Reviewed by Andreas Kling.
     7
     8        This is another step towards eliminating MessageID.
     9
     10        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     11        (WebKit::NetworkConnectionToWebProcess::didReceiveMessage):
     12        (WebKit::NetworkConnectionToWebProcess::didReceiveSyncMessage):
     13        * NetworkProcess/NetworkConnectionToWebProcess.h:
     14        (NetworkConnectionToWebProcess):
     15        * NetworkProcess/NetworkProcess.cpp:
     16        (WebKit::NetworkProcess::didReceiveMessage):
     17        (WebKit::NetworkProcess::didReceiveSyncMessage):
     18        * NetworkProcess/NetworkProcess.h:
     19        (NetworkProcess):
     20        * Platform/CoreIPC/Connection.cpp:
     21        (CoreIPC::Connection::processIncomingMessage):
     22        (CoreIPC::Connection::dispatchSyncMessage):
     23        (CoreIPC::Connection::dispatchMessage):
     24        * Platform/CoreIPC/Connection.h:
     25        (QueueClient):
     26        (CoreIPC::Connection::waitForAndDispatchImmediately):
     27        * Platform/CoreIPC/MessageReceiver.h:
     28        (MessageReceiver):
     29        (CoreIPC::MessageReceiver::didReceiveSyncMessage):
     30        * Platform/CoreIPC/MessageReceiverMap.cpp:
     31        (CoreIPC::MessageReceiverMap::dispatchMessage):
     32        (CoreIPC::MessageReceiverMap::dispatchSyncMessage):
     33        * Platform/CoreIPC/MessageReceiverMap.h:
     34        (MessageReceiverMap):
     35        * PluginProcess/PluginProcess.cpp:
     36        (WebKit::PluginProcess::didReceiveMessage):
     37        * PluginProcess/PluginProcess.h:
     38        (PluginProcess):
     39        * PluginProcess/WebProcessConnection.cpp:
     40        (WebKit::WebProcessConnection::didReceiveMessage):
     41        (WebKit::WebProcessConnection::didReceiveSyncMessage):
     42        * PluginProcess/WebProcessConnection.h:
     43        (WebProcessConnection):
     44        * Scripts/webkit2/messages.py:
     45        (forward_declarations_and_headers):
     46        (generate_message_handler):
     47        * Scripts/webkit2/messages_unittest.py:
     48        * Shared/Authentication/AuthenticationManager.cpp:
     49        (WebKit::AuthenticationManager::didReceiveMessage):
     50        * Shared/Authentication/AuthenticationManager.h:
     51        (AuthenticationManager):
     52        * Shared/ChildProcessProxy.cpp:
     53        (WebKit::ChildProcessProxy::sendMessage):
     54        * Shared/ChildProcessProxy.h:
     55        (ChildProcessProxy):
     56        (WebKit::ChildProcessProxy::send):
     57        * Shared/Network/CustomProtocols/CustomProtocolManager.h:
     58        (CustomProtocolManager):
     59        * Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:
     60        (WebKit::CustomProtocolManager::didReceiveMessage):
     61        * Shared/Plugins/NPRemoteObjectMap.cpp:
     62        (WebKit::NPRemoteObjectMap::didReceiveSyncMessage):
     63        * Shared/Plugins/NPRemoteObjectMap.h:
     64        (NPRemoteObjectMap):
     65        * Shared/WebConnection.cpp:
     66        (WebKit::WebConnection::didReceiveMessage):
     67        * Shared/WebConnection.h:
     68        (WebConnection):
     69        * Shared/mac/SecItemShim.cpp:
     70        (WebKit::SecItemShim::didReceiveMessageOnConnectionWorkQueue):
     71        * Shared/mac/SecItemShim.h:
     72        (SecItemShim):
     73        * SharedWorkerProcess/SharedWorkerProcess.cpp:
     74        (WebKit::SharedWorkerProcess::didReceiveMessage):
     75        * SharedWorkerProcess/SharedWorkerProcess.h:
     76        (SharedWorkerProcess):
     77        * UIProcess/Downloads/DownloadProxy.cpp:
     78        (WebKit::DownloadProxy::didReceiveMessage):
     79        (WebKit::DownloadProxy::didReceiveSyncMessage):
     80        * UIProcess/Downloads/DownloadProxy.h:
     81        (DownloadProxy):
     82        * UIProcess/DrawingAreaProxy.cpp:
     83        (WebKit::DrawingAreaProxy::didReceiveCoordinatedLayerTreeHostProxyMessage):
     84        * UIProcess/DrawingAreaProxy.h:
     85        (DrawingAreaProxy):
     86        * UIProcess/DrawingAreaProxyImpl.cpp:
     87        (WebKit::DrawingAreaProxyImpl::didReceiveCoordinatedLayerTreeHostProxyMessage):
     88        * UIProcess/DrawingAreaProxyImpl.h:
     89        * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
     90        (CustomProtocolManagerProxy):
     91        * UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
     92        (WebKit::CustomProtocolManagerProxy::didReceiveMessage):
     93        * UIProcess/Network/NetworkProcessProxy.cpp:
     94        (WebKit::NetworkProcessProxy::didReceiveMessage):
     95        (WebKit::NetworkProcessProxy::didReceiveSyncMessage):
     96        * UIProcess/Network/NetworkProcessProxy.h:
     97        (NetworkProcessProxy):
     98        * UIProcess/Notifications/WebNotificationManagerProxy.h:
     99        (WebNotificationManagerProxy):
     100        * UIProcess/Plugins/PluginProcessProxy.cpp:
     101        (WebKit::PluginProcessProxy::didReceiveMessage):
     102        * UIProcess/Plugins/PluginProcessProxy.h:
     103        (PluginProcessProxy):
     104        * UIProcess/SharedWorkers/SharedWorkerProcessProxy.cpp:
     105        (WebKit::SharedWorkerProcessProxy::didReceiveMessage):
     106        * UIProcess/SharedWorkers/SharedWorkerProcessProxy.h:
     107        (SharedWorkerProcessProxy):
     108        * UIProcess/WebApplicationCacheManagerProxy.cpp:
     109        (WebKit::WebApplicationCacheManagerProxy::didReceiveMessage):
     110        * UIProcess/WebApplicationCacheManagerProxy.h:
     111        (WebApplicationCacheManagerProxy):
     112        * UIProcess/WebContext.cpp:
     113        (WebKit::WebContext::dispatchMessage):
     114        (WebKit::WebContext::dispatchSyncMessage):
     115        (WebKit::WebContext::didReceiveMessage):
     116        (WebKit::WebContext::didReceiveSyncMessage):
     117        * UIProcess/WebContext.h:
     118        (WebContext):
     119        * UIProcess/WebCookieManagerProxy.cpp:
     120        (WebKit::WebCookieManagerProxy::didReceiveMessage):
     121        * UIProcess/WebCookieManagerProxy.h:
     122        (WebCookieManagerProxy):
     123        * UIProcess/WebDatabaseManagerProxy.cpp:
     124        (WebKit::WebDatabaseManagerProxy::didReceiveMessage):
     125        * UIProcess/WebDatabaseManagerProxy.h:
     126        (WebDatabaseManagerProxy):
     127        * UIProcess/WebFullScreenManagerProxy.cpp:
     128        (WebKit::WebFullScreenManagerProxy::didReceiveMessage):
     129        (WebKit::WebFullScreenManagerProxy::didReceiveSyncMessage):
     130        * UIProcess/WebFullScreenManagerProxy.h:
     131        (WebFullScreenManagerProxy):
     132        * UIProcess/WebGeolocationManagerProxy.h:
     133        (WebGeolocationManagerProxy):
     134        * UIProcess/WebIconDatabase.h:
     135        (WebIconDatabase):
     136        * UIProcess/WebKeyValueStorageManagerProxy.h:
     137        (WebKeyValueStorageManagerProxy):
     138        * UIProcess/WebMediaCacheManagerProxy.h:
     139        (WebMediaCacheManagerProxy):
     140        * UIProcess/WebPageProxy.cpp:
     141        (WebKit::WebPageProxy::didReceiveMessage):
     142        (WebKit::WebPageProxy::didReceiveSyncMessage):
     143        * UIProcess/WebPageProxy.h:
     144        (WebPageProxy):
     145        * UIProcess/WebProcessProxy.cpp:
     146        (WebKit::WebProcessProxy::didReceiveMessage):
     147        (WebKit::WebProcessProxy::didReceiveSyncMessage):
     148        (WebKit::WebProcessProxy::didReceiveMessageOnConnectionWorkQueue):
     149        * UIProcess/WebProcessProxy.h:
     150        (WebProcessProxy):
     151        * UIProcess/WebResourceCacheManagerProxy.h:
     152        (WebResourceCacheManagerProxy):
     153        * UIProcess/mac/RemoteLayerTreeHost.h:
     154        (RemoteLayerTreeHost):
     155        * UIProcess/mac/RemoteLayerTreeHost.mm:
     156        (WebKit::RemoteLayerTreeHost::didReceiveMessage):
     157        * UIProcess/mac/SecItemShimProxy.cpp:
     158        (WebKit::SecItemShimProxy::didReceiveMessageOnConnectionWorkQueue):
     159        * UIProcess/mac/SecItemShimProxy.h:
     160        (SecItemShimProxy):
     161        * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
     162        (WebKit::WebApplicationCacheManager::didReceiveMessage):
     163        * WebProcess/ApplicationCache/WebApplicationCacheManager.h:
     164        (WebApplicationCacheManager):
     165        * WebProcess/Cookies/WebCookieManager.cpp:
     166        (WebKit::WebCookieManager::didReceiveMessage):
     167        * WebProcess/Cookies/WebCookieManager.h:
     168        (WebCookieManager):
     169        * WebProcess/FullScreen/WebFullScreenManager.cpp:
     170        (WebKit::WebFullScreenManager::didReceiveMessage):
     171        * WebProcess/FullScreen/WebFullScreenManager.h:
     172        (WebFullScreenManager):
     173        * WebProcess/Geolocation/WebGeolocationManager.h:
     174        (WebGeolocationManager):
     175        * WebProcess/IconDatabase/WebIconDatabaseProxy.h:
     176        (WebIconDatabaseProxy):
     177        * WebProcess/MediaCache/WebMediaCacheManager.h:
     178        (WebMediaCacheManager):
     179        * WebProcess/Network/NetworkProcessConnection.cpp:
     180        (WebKit::NetworkProcessConnection::didReceiveMessage):
     181        (WebKit::NetworkProcessConnection::didReceiveSyncMessage):
     182        * WebProcess/Network/NetworkProcessConnection.h:
     183        (NetworkProcessConnection):
     184        * WebProcess/Notifications/WebNotificationManager.h:
     185        (WebNotificationManager):
     186        * WebProcess/Plugins/PluginProcessConnection.cpp:
     187        (WebKit::PluginProcessConnection::didReceiveMessage):
     188        (WebKit::PluginProcessConnection::didReceiveSyncMessage):
     189        * WebProcess/Plugins/PluginProcessConnection.h:
     190        (PluginProcessConnection):
     191        * WebProcess/ResourceCache/WebResourceCacheManager.h:
     192        (WebResourceCacheManager):
     193        * WebProcess/Storage/WebKeyValueStorageManager.h:
     194        (WebKeyValueStorageManager):
     195        * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
     196        (WebKit::WebDatabaseManager::didReceiveMessage):
     197        * WebProcess/WebCoreSupport/WebDatabaseManager.h:
     198        (WebDatabaseManager):
     199        * WebProcess/WebPage/DrawingArea.h:
     200        (DrawingArea):
     201        * WebProcess/WebPage/DrawingAreaImpl.cpp:
     202        (WebKit::DrawingAreaImpl::didReceiveCoordinatedLayerTreeHostMessage):
     203        * WebProcess/WebPage/DrawingAreaImpl.h:
     204        (DrawingAreaImpl):
     205        * WebProcess/WebPage/EventDispatcher.cpp:
     206        (WebKit::EventDispatcher::didReceiveMessageOnConnectionWorkQueue):
     207        * WebProcess/WebPage/EventDispatcher.h:
     208        (EventDispatcher):
     209        * WebProcess/WebPage/LayerTreeHost.h:
     210        (LayerTreeHost):
     211        * WebProcess/WebPage/WebPage.cpp:
     212        (WebKit::WebPage::didReceiveMessage):
     213        (WebKit::WebPage::didReceiveSyncMessage):
     214        * WebProcess/WebPage/WebPage.h:
     215        (WebPage):
     216        * WebProcess/WebPage/WebPageGroupProxy.h:
     217        (WebPageGroupProxy):
     218        * WebProcess/WebProcess.cpp:
     219        (WebKit::WebProcess::didReceiveSyncMessage):
     220        (WebKit::WebProcess::didReceiveMessage):
     221        (WebKit::WebProcess::didReceiveMessageOnConnectionWorkQueue):
     222        * WebProcess/WebProcess.h:
     223        (WebProcess):
     224
    12252013-01-30  Tim Horton  <timothy_horton@apple.com>
    2226

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp

    r141322 r141361  
    6161}
    6262   
    63 void NetworkConnectionToWebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     63void NetworkConnectionToWebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    6464{
    6565    if (decoder.messageReceiverName() == Messages::NetworkConnectionToWebProcess::messageReceiverName()) {
    … …  
    7171}
    7272
    73 void NetworkConnectionToWebProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& reply)
     73void NetworkConnectionToWebProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& reply)
    7474{
    7575    if (decoder.messageReceiverName() == Messages::NetworkConnectionToWebProcess::messageReceiverName()) {

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h

    r141322 r141361  
    6060
    6161    // CoreIPC::Connection::Client
    62     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    63     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
     62    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
     63    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
    6464    virtual void didClose(CoreIPC::Connection*);
    6565    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

    r141322 r141361  
    9696}
    9797
    98 void NetworkProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
    99 {
    100     if (messageReceiverMap().dispatchMessage(connection, messageID, decoder))
     98void NetworkProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
     99{
     100    if (messageReceiverMap().dispatchMessage(connection, decoder))
    101101        return;
    102102
    … …  
    104104}
    105105
    106 void NetworkProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    107 {
    108     messageReceiverMap().dispatchSyncMessage(connection, messageID, decoder, replyEncoder);
     106void NetworkProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     107{
     108    messageReceiverMap().dispatchSyncMessage(connection, decoder, replyEncoder);
    109109}
    110110

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

    r141322 r141361  
    8585
    8686    // CoreIPC::Connection::Client
    87     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    88     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
     87    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
     88    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
    8989    virtual void didClose(CoreIPC::Connection*) OVERRIDE;
    9090    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;

  • trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp

    r141209 r141361  
    602602
    603603        MessageDecoder* decoder = incomingMessage.arguments();
    604         m_connectionQueueClients[i]->didReceiveMessageOnConnectionWorkQueue(this, incomingMessage.messageID(), *decoder, didHandleMessage);
     604        m_connectionQueueClients[i]->didReceiveMessageOnConnectionWorkQueue(this, *decoder, didHandleMessage);
    605605        if (didHandleMessage) {
    606606            // A connection queue client handled the message, our work here is done.
    … …  
    697697
    698698    // Hand off both the decoder and encoder to the client.
    699     m_client->didReceiveSyncMessage(this, messageID, decoder, replyEncoder);
     699    m_client->didReceiveSyncMessage(this, decoder, replyEncoder);
    700700
    701701    // FIXME: If the message was invalid, we should send back a SyncMessageError.
    … …  
    726726void Connection::dispatchMessage(MessageID messageID, MessageDecoder& decoder)
    727727{
    728     m_client->didReceiveMessage(this, messageID, decoder);
     728    m_client->didReceiveMessage(this, decoder);
    729729}
    730730

  • trunk/Source/WebKit2/Platform/CoreIPC/Connection.h

    r141191 r141361  
    3232#include "MessageDecoder.h"
    3333#include "MessageEncoder.h"
     34#include "MessageID.h"
    3435#include "MessageReceiver.h"
    3536#include "WorkQueue.h"
    … …  
    9596    class QueueClient {
    9697    public:
    97         virtual void didReceiveMessageOnConnectionWorkQueue(Connection*, MessageID, MessageDecoder&, bool& didHandleMessage) = 0;
     98        virtual void didReceiveMessageOnConnectionWorkQueue(Connection*, MessageDecoder&, bool& didHandleMessage) = 0;
    9899
    99100    protected:
    … …  
    435436
    436437    ASSERT(decoder->destinationID() == destinationID);
    437     m_client->didReceiveMessage(this, MessageID(), *decoder);
     438    m_client->didReceiveMessage(this, *decoder);
    438439    return true;
    439440}

  • trunk/Source/WebKit2/Platform/CoreIPC/MessageReceiver.h

    r131807 r141361  
    2727#define MessageReceiver_h
    2828
    29 #include "MessageID.h"
    3029#include <wtf/Assertions.h>
    3130#include <wtf/OwnPtr.h>
    … …  
    4140    virtual ~MessageReceiver() { }
    4241
    43     virtual void didReceiveMessage(Connection*, MessageID, MessageDecoder&) = 0;
    44     virtual void didReceiveSyncMessage(Connection*, MessageID, MessageDecoder&, OwnPtr<MessageEncoder>&)
     42    virtual void didReceiveMessage(Connection*, MessageDecoder&) = 0;
     43    virtual void didReceiveSyncMessage(Connection*, MessageDecoder&, OwnPtr<MessageEncoder>&)
    4544    {
    4645        ASSERT_NOT_REACHED();

  • trunk/Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.cpp

    r132386 r141361  
    7474}
    7575
    76 bool MessageReceiverMap::dispatchMessage(Connection* connection, MessageID messageID, MessageDecoder& decoder)
     76bool MessageReceiverMap::dispatchMessage(Connection* connection, MessageDecoder& decoder)
    7777{
    7878    if (MessageReceiver* messageReceiver = m_globalMessageReceivers.get(decoder.messageReceiverName())) {
    7979        ASSERT(!decoder.destinationID());
    8080
    81         messageReceiver->didReceiveMessage(connection, messageID, decoder);
     81        messageReceiver->didReceiveMessage(connection, decoder);
    8282        return true;
    8383    }
    8484
    8585    if (MessageReceiver* messageReceiver = m_messageReceivers.get(std::make_pair(decoder.messageReceiverName(), decoder.destinationID()))) {
    86         messageReceiver->didReceiveMessage(connection, messageID, decoder);
     86        messageReceiver->didReceiveMessage(connection, decoder);
    8787        return true;
    8888    }
    … …  
    9191}
    9292
    93 bool MessageReceiverMap::dispatchSyncMessage(Connection* connection, MessageID messageID, MessageDecoder& decoder, OwnPtr<MessageEncoder>& replyEncoder)
     93bool MessageReceiverMap::dispatchSyncMessage(Connection* connection, MessageDecoder& decoder, OwnPtr<MessageEncoder>& replyEncoder)
    9494{
    9595    if (MessageReceiver* messageReceiver = m_globalMessageReceivers.get(decoder.messageReceiverName())) {
    9696        ASSERT(!decoder.destinationID());
    9797
    98         messageReceiver->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
     98        messageReceiver->didReceiveSyncMessage(connection, decoder, replyEncoder);
    9999        return true;
    100100    }
    101101
    102102    if (MessageReceiver* messageReceiver = m_messageReceivers.get(std::make_pair(decoder.messageReceiverName(), decoder.destinationID()))) {
    103         messageReceiver->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
     103        messageReceiver->didReceiveSyncMessage(connection, decoder, replyEncoder);
    104104        return true;
    105105    }

  • trunk/Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.h

    r132386 r141361  
    2727#define MessageReceiverMap_h
    2828
    29 #include "MessageID.h"
    3029#include "StringReference.h"
    3130#include <wtf/HashMap.h>
    … …  
    5251    void invalidate();
    5352
    54     bool dispatchMessage(Connection*, MessageID, MessageDecoder&);
    55     bool dispatchSyncMessage(Connection*, MessageID, MessageDecoder&, OwnPtr<MessageEncoder>&);
     53    bool dispatchMessage(Connection*, MessageDecoder&);
     54    bool dispatchSyncMessage(Connection*, MessageDecoder&, OwnPtr<MessageEncoder>&);
    5655
    5756private:

  • trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp

    r141322 r141361  
    131131}
    132132
    133 void PluginProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     133void PluginProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    134134{
    135135    didReceivePluginProcessMessage(connection, decoder);

  • trunk/Source/WebKit2/PluginProcess/PluginProcess.h

    r141322 r141361  
    7777
    7878    // CoreIPC::Connection::Client
    79     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     79    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    8080    virtual void didClose(CoreIPC::Connection*) OVERRIDE;
    8181    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;

  • trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp

    r141322 r141361  
    117117}
    118118
    119 void WebProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     119void WebProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    120120{
    121121    ConnectionStack::CurrentConnectionPusher currentConnection(ConnectionStack::shared(), connection);
    … …  
    139139}
    140140
    141 void WebProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     141void WebProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    142142{
    143143    ConnectionStack::CurrentConnectionPusher currentConnection(ConnectionStack::shared(), connection);
    … …  
    151151
    152152    if (decoder.messageReceiverName() == Messages::NPObjectMessageReceiver::messageReceiverName()) {
    153         m_npRemoteObjectMap->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
     153        m_npRemoteObjectMap->didReceiveSyncMessage(connection, decoder, replyEncoder);
    154154        return;
    155155    }

  • trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h

    r141322 r141361  
    6363
    6464    // CoreIPC::Connection::Client
    65     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    66     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
     65    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
     66    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
    6767    virtual void didClose(CoreIPC::Connection*);
    6868    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);

  • trunk/Source/WebKit2/Scripts/webkit2/messages.py

    r141322 r141361  
    224224        '"Arguments.h"',
    225225        '"MessageEncoder.h"',
    226         '"MessageID.h"',
    227226        '"StringReference.h"',
    228227    ])
    … …  
    548547            result.append('void %s::didReceive%sMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder& decoder)\n' % (receiver.name, receiver.name))
    549548        else:
    550             result.append('void %s::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder& decoder)\n' % (receiver.name))
     549            result.append('void %s::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder& decoder)\n' % (receiver.name))
    551550
    552551        result.append('{\n')
    … …  
    560559            result.append('void %s::didReceiveSync%sMessage(CoreIPC::Connection*%s, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)\n' % (receiver.name, receiver.name, ' connection' if sync_delayed_messages else ''))
    561560        else:
    562             result.append('void %s::didReceiveSyncMessage(CoreIPC::Connection*%s,CoreIPC::MessageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)\n' % (receiver.name, ' connection' if sync_delayed_messages else ''))
     561            result.append('void %s::didReceiveSyncMessage(CoreIPC::Connection*%s, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)\n' % (receiver.name, ' connection' if sync_delayed_messages else ''))
    563562        result.append('{\n')
    564563        result += [sync_message_statement(receiver, message) for message in sync_messages]

  • trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py

    r141322 r141361  
    317317#include "Connection.h"
    318318#include "MessageEncoder.h"
    319 #include "MessageID.h"
    320319#include "Plugin.h"
    321320#include "StringReference.h"

  • trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp

    r141322 r141361  
    6565}
    6666
    67 void AuthenticationManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     67void AuthenticationManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    6868{
    6969    didReceiveAuthenticationManagerMessage(connection, decoder);

  • trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h

    r141322 r141361  
    6666private:
    6767    // CoreIPC::MessageReceiver
    68     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     68    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    6969    void didReceiveAuthenticationManagerMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    7070

  • trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp

    r141191 r141361  
    7676}
    7777
    78 bool ChildProcessProxy::sendMessage(CoreIPC::MessageID messageID, PassOwnPtr<CoreIPC::MessageEncoder> encoder, unsigned messageSendFlags)
     78bool ChildProcessProxy::sendMessage(PassOwnPtr<CoreIPC::MessageEncoder> encoder, unsigned messageSendFlags)
    7979{
    8080    // If we're waiting for the web process to launch, we need to stash away the messages so we can send them once we have
    8181    // a CoreIPC connection.
    8282    if (isLaunching()) {
    83         m_pendingMessages.append(std::make_pair(CoreIPC::Connection::OutgoingMessage(messageID, encoder), messageSendFlags));
     83        m_pendingMessages.append(std::make_pair(CoreIPC::Connection::OutgoingMessage(CoreIPC::MessageID(), encoder), messageSendFlags));
    8484        return true;
    8585    }

  • trunk/Source/WebKit2/Shared/ChildProcessProxy.h

    r141183 r141361  
    6969    virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) = 0;
    7070
    71     bool sendMessage(CoreIPC::MessageID, PassOwnPtr<CoreIPC::MessageEncoder>, unsigned messageSendFlags);
     71    bool sendMessage(PassOwnPtr<CoreIPC::MessageEncoder>, unsigned messageSendFlags);
    7272
    7373    Vector<std::pair<CoreIPC::Connection::OutgoingMessage, unsigned> > m_pendingMessages;
    … …  
    8585    encoder->encode(message);
    8686
    87     return sendMessage(CoreIPC::MessageID(), encoder.release(), messageSendFlags);
     87    return sendMessage(encoder.release(), messageSendFlags);
    8888}
    8989

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h

    r141322 r141361  
    8484
    8585    // CoreIPC::MessageReceiver
    86     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     86    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    8787    void didReceiveCustomProtocolManagerMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    8888

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm

    r141322 r141361  
    176176}
    177177
    178 void CustomProtocolManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     178void CustomProtocolManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    179179{
    180180    didReceiveCustomProtocolManagerMessage(connection, decoder);

  • trunk/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp

    r141322 r141361  
    228228}
    229229
    230 void NPRemoteObjectMap::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     230void NPRemoteObjectMap::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    231231{
    232232    NPObjectMessageReceiver* messageReceiver = m_registeredNPObjects.get(decoder.destinationID());

  • trunk/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.h

    r131807 r141361  
    6565    void pluginDestroyed(Plugin*);
    6666
    67     void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
     67    void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
    6868
    6969private:

  • trunk/Source/WebKit2/Shared/WebConnection.cpp

    r141322 r141361  
    6464}
    6565
    66 void WebConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     66void WebConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    6767{
    6868    didReceiveWebConnectionMessage(connection, decoder);

  • trunk/Source/WebKit2/Shared/WebConnection.h

    r141322 r141361  
    5757
    5858    // CoreIPC::MessageReceiver
    59     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     59    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    6060
    6161    // Implemented in generated WebConnectionMessageReceiver.cpp

  • trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp

    r141322 r141361  
    133133}
    134134
    135 void SecItemShim::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
     135void SecItemShim::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
    136136{
    137137    if (decoder.messageReceiverName() == Messages::SecItemShim::messageReceiverName()) {

  • trunk/Source/WebKit2/Shared/mac/SecItemShim.h

    r141322 r141361  
    4747
    4848    // QueueClient
    49     virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
     49    virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
    5050
    5151    // Implemented in generated SecItemShimMessageReceiver.cpp.

  • trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp

    r141322 r141361  
    9595}
    9696
    97 void SharedWorkerProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     97void SharedWorkerProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    9898{
    9999    didReceiveSharedWorkerProcessMessage(connection, decoder);

  • trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h

    r141322 r141361  
    5252
    5353    // CoreIPC::Connection::Client
    54     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     54    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    5555    virtual void didClose(CoreIPC::Connection*);
    5656    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;

  • trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp

    r141322 r141361  
    9898}
    9999
    100 void DownloadProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     100void DownloadProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    101101{
    102102    didReceiveDownloadProxyMessage(connection, decoder);
    103103}
    104104
    105 void DownloadProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     105void DownloadProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    106106{
    107107    didReceiveSyncDownloadProxyMessage(connection, decoder, replyEncoder);

  • trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h

    r141322 r141361  
    7676
    7777    // CoreIPC::MessageReceiver
    78     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    79     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
     78    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
     79    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
    8080
    8181    // Message handlers.

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp

    r137358 r141361  
    7070}
    7171
    72 void DrawingAreaProxy::didReceiveCoordinatedLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&)
     72void DrawingAreaProxy::didReceiveCoordinatedLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&)
    7373{
    7474}

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h

    r141322 r141361  
    8888    CoordinatedLayerTreeHostProxy* coordinatedLayerTreeHostProxy() const { return m_coordinatedLayerTreeHostProxy.get(); }
    8989    virtual void setVisibleContentsRect(const WebCore::FloatRect& /* visibleContentsRect */, const WebCore::FloatPoint& /* trajectoryVector */) { }
    90     virtual void didReceiveCoordinatedLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     90    virtual void didReceiveCoordinatedLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    9191
    9292    WebPageProxy* page() { return m_webPageProxy; }

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp

    r141310 r141361  
    371371
    372372#if USE(COORDINATED_GRAPHICS)
    373 void DrawingAreaProxyImpl::didReceiveCoordinatedLayerTreeHostProxyMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     373void DrawingAreaProxyImpl::didReceiveCoordinatedLayerTreeHostProxyMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    374374{
    375375    if (m_coordinatedLayerTreeHostProxy)

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h

    r141310 r141361  
    8585#if USE(COORDINATED_GRAPHICS)
    8686    virtual void setVisibleContentsRect(const WebCore::FloatRect& visibleContentsRect, const WebCore::FloatPoint& trajectory) OVERRIDE;
    87     void didReceiveCoordinatedLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     87    void didReceiveCoordinatedLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    8888#endif
    8989#else

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h

    r141322 r141361  
    5454    explicit CustomProtocolManagerProxy(ChildProcessProxy*);
    5555
    56     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     56    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    5757    void startLoading(uint64_t customProtocolID, const WebCore::ResourceRequest&);
    5858    void stopLoading(uint64_t customProtocolID);

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm

    r141322 r141361  
    128128}
    129129
    130 void CustomProtocolManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     130void CustomProtocolManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    131131{
    132132    didReceiveCustomProtocolManagerProxyMessage(connection, decoder);

  • trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp

    r141322 r141361  
    110110}
    111111
    112 void NetworkProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
    113 {
    114     if (m_messageReceiverMap.dispatchMessage(connection, messageID, decoder))
    115         return;
    116 
    117     if (m_webContext->dispatchMessage(connection, messageID, decoder))
     112void NetworkProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
     113{
     114    if (m_messageReceiverMap.dispatchMessage(connection, decoder))
     115        return;
     116
     117    if (m_webContext->dispatchMessage(connection, decoder))
    118118        return;
    119119
    120120#if ENABLE(CUSTOM_PROTOCOLS)
    121121    if (decoder.messageReceiverName() == Messages::CustomProtocolManagerProxy::messageReceiverName()) {
    122         m_customProtocolManagerProxy.didReceiveMessage(connection, messageID, decoder);
     122        m_customProtocolManagerProxy.didReceiveMessage(connection, decoder);
    123123        return;
    124124    }
    … …  
    128128}
    129129
    130 void NetworkProcessProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    131 {
    132     if (m_messageReceiverMap.dispatchSyncMessage(connection, messageID, decoder, replyEncoder))
     130void NetworkProcessProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     131{
     132    if (m_messageReceiverMap.dispatchSyncMessage(connection, decoder, replyEncoder))
    133133        return;
    134134

  • trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h

    r141322 r141361  
    7373
    7474    // CoreIPC::Connection::Client
    75     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    76     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
     75    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
     76    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
    7777    virtual void didClose(CoreIPC::Connection*) OVERRIDE;
    7878    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;

  • trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h

    r140607 r141361  
    7878
    7979    // CoreIPC::MessageReceiver
    80     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     80    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    8181   
    8282    // Message handlers

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp

    r141322 r141361  
    158158}
    159159
    160 void PluginProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     160void PluginProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    161161{
    162162    didReceivePluginProcessProxyMessage(connection, decoder);

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h

    r141322 r141361  
    106106
    107107    // CoreIPC::Connection::Client
    108     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     108    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    109109    virtual void didClose(CoreIPC::Connection*) OVERRIDE;
    110110    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;

  • trunk/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessProxy.cpp

    r141322 r141361  
    116116}
    117117
    118 void SharedWorkerProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     118void SharedWorkerProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    119119{
    120120    didReceiveSharedWorkerProcessProxyMessage(connection, decoder);

  • trunk/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessProxy.h

    r141322 r141361  
    6969
    7070    // CoreIPC::Connection::Client
    71     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     71    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    7272    virtual void didClose(CoreIPC::Connection*);
    7373    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);

  • trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp

    r141322 r141361  
    8282}
    8383
    84 void WebApplicationCacheManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     84void WebApplicationCacheManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    8585{
    8686    didReceiveWebApplicationCacheManagerProxyMessage(connection,  decoder);

  • trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h

    r141322 r141361  
    7979
    8080    // CoreIPC::MessageReceiver
    81     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     81    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    8282    void didReceiveWebApplicationCacheManagerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    8383

  • trunk/Source/WebKit2/UIProcess/WebContext.cpp

    r141322 r141361  
    882882}
    883883
    884 bool WebContext::dispatchMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
    885 {
    886     return m_messageReceiverMap.dispatchMessage(connection, messageID, decoder);
    887 }
    888 
    889 bool WebContext::dispatchSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    890 {
    891     return m_messageReceiverMap.dispatchSyncMessage(connection, messageID, decoder, replyEncoder);
    892 }
    893 
    894 void WebContext::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     884bool WebContext::dispatchMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
     885{
     886    return m_messageReceiverMap.dispatchMessage(connection, decoder);
     887}
     888
     889bool WebContext::dispatchSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     890{
     891    return m_messageReceiverMap.dispatchSyncMessage(connection, decoder, replyEncoder);
     892}
     893
     894void WebContext::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    895895{
    896896    if (decoder.messageReceiverName() == Messages::WebContext::messageReceiverName()) {
    … …  
    916916}
    917917
    918 void WebContext::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     918void WebContext::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    919919{
    920920    if (decoder.messageReceiverName() == Messages::WebContext::messageReceiverName()) {

  • trunk/Source/WebKit2/UIProcess/WebContext.h

    r141322 r141361  
    109109    void removeMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID);
    110110
    111     bool dispatchMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    112     bool dispatchSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
     111    bool dispatchMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
     112    bool dispatchSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
    113113
    114114    void initializeClient(const WKContextClient*);
    … …  
    177177
    178178    // MessageReceiver.
    179     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    180     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
     179    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
     180    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
    181181
    182182    void setCacheModel(CacheModel);

  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp

    r141322 r141361  
    102102// CoreIPC::MessageReceiver
    103103
    104 void WebCookieManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     104void WebCookieManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    105105{
    106106    didReceiveWebCookieManagerProxyMessage(connection, decoder);

  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h

    r141322 r141361  
    102102
    103103    // CoreIPC::MessageReceiver
    104     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     104    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    105105    void didReceiveWebCookieManagerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    106106

  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp

    r141322 r141361  
    143143// CoreIPC::MessageReceiver
    144144
    145 void WebDatabaseManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     145void WebDatabaseManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    146146{
    147147    didReceiveWebDatabaseManagerProxyMessage(connection, decoder);

  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h

    r141322 r141361  
    9090
    9191    // CoreIPC::MessageReceiver
    92     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     92    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    9393    void didReceiveWebDatabaseManagerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    9494

  • trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp

    r141322 r141361  
    5555}
    5656
    57 void WebFullScreenManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     57void WebFullScreenManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    5858{
    5959    didReceiveWebFullScreenManagerProxyMessage(connection, decoder);
    6060}
    6161
    62 void WebFullScreenManagerProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     62void WebFullScreenManagerProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    6363{
    6464    didReceiveSyncWebFullScreenManagerProxyMessage(connection, decoder, replyEncoder);

  • trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h

    r141322 r141361  
    7777    void close();
    7878
    79     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    80     void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
     79    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
     80    void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
    8181
    8282    void willEnterFullScreen();

  • trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h

    r140607 r141361  
    6767
    6868    // CoreIPC::MessageReceiver
    69     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     69    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    7070
    7171    void startUpdating();

  • trunk/Source/WebKit2/UIProcess/WebIconDatabase.h

    r140607 r141361  
    104104
    105105    // CoreIPC::MessageReceiver
    106     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    107     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
     106    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
     107    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
    108108
    109109    void notifyIconDataReadyForPageURL(const String&);

  • trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.h

    r140607 r141361  
    7676
    7777    // CoreIPC::MessageReceiver
    78     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     78    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    7979
    8080    HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks;

  • trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h

    r140607 r141361  
    7474
    7575    // CoreIPC::MessageReceiver
    76     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     76    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    7777
    7878    HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r141322 r141361  
    19261926}
    19271927
    1928 void WebPageProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     1928void WebPageProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    19291929{
    19301930    if (decoder.messageReceiverName() == Messages::DrawingAreaProxy::messageReceiverName()) {
    … …  
    19501950#if ENABLE(FULLSCREEN_API)
    19511951    if (decoder.messageReceiverName() == Messages::WebFullScreenManagerProxy::messageReceiverName()) {
    1952         fullScreenManager()->didReceiveMessage(connection, messageID, decoder);
     1952        fullScreenManager()->didReceiveMessage(connection, decoder);
    19531953        return;
    19541954    }
    … …  
    19581958}
    19591959
    1960 void WebPageProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     1960void WebPageProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    19611961{
    19621962#if ENABLE(INSPECTOR)
    … …  
    19701970#if ENABLE(FULLSCREEN_API)
    19711971    if (decoder.messageReceiverName() == Messages::WebFullScreenManagerProxy::messageReceiverName()) {
    1972         fullScreenManager()->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
     1972        fullScreenManager()->didReceiveSyncMessage(connection, decoder, replyEncoder);
    19731973        return;
    19741974    }

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r141322 r141361  
    601601#endif
    602602
    603     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    604     void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
     603    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
     604    void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
    605605
    606606    void processDidBecomeUnresponsive();

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r141322 r141361  
    416416#endif // ENABLE(NETWORK_PROCESS)
    417417
    418 void WebProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
    419 {
    420     if (m_messageReceiverMap.dispatchMessage(connection, messageID, decoder))
    421         return;
    422 
    423     if (m_context->dispatchMessage(connection, messageID, decoder))
     418void WebProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
     419{
     420    if (m_messageReceiverMap.dispatchMessage(connection, decoder))
     421        return;
     422
     423    if (m_context->dispatchMessage(connection, decoder))
    424424        return;
    425425
    … …  
    434434        ASSERT(!context()->usesNetworkProcess());
    435435#endif
    436         m_customProtocolManagerProxy.didReceiveMessage(connection, messageID, decoder);
     436        m_customProtocolManagerProxy.didReceiveMessage(connection, decoder);
    437437        return;
    438438    }
    … …  
    447447        return;
    448448   
    449     pageProxy->didReceiveMessage(connection, messageID, decoder);
    450 }
    451 
    452 void WebProcessProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    453 {
    454     if (m_messageReceiverMap.dispatchSyncMessage(connection, messageID, decoder, replyEncoder))
    455         return;
    456 
    457     if (m_context->dispatchSyncMessage(connection, messageID, decoder, replyEncoder))
     449    pageProxy->didReceiveMessage(connection, decoder);
     450}
     451
     452void WebProcessProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     453{
     454    if (m_messageReceiverMap.dispatchSyncMessage(connection, decoder, replyEncoder))
     455        return;
     456
     457    if (m_context->dispatchSyncMessage(connection, decoder, replyEncoder))
    458458        return;
    459459
    … …  
    471471        return;
    472472   
    473     pageProxy->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
    474 }
    475 
    476 void WebProcessProxy::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
     473    pageProxy->didReceiveSyncMessage(connection, decoder, replyEncoder);
     474}
     475
     476void WebProcessProxy::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
    477477{
    478478    if (decoder.messageReceiverName() == Messages::WebProcessProxy::messageReceiverName())

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

    r141322 r141361  
    161161    // CoreIPC::Connection::Client
    162162    friend class WebConnectionToWebProcess;
    163     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    164     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
     163    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
     164    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
    165165    virtual void didClose(CoreIPC::Connection*) OVERRIDE;
    166166    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
    167167
    168168    // CoreIPC::Connection::QueueClient
    169     virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
     169    virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
    170170
    171171    // ResponsivenessTimer::Client

  • trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h

    r140607 r141361  
    7474
    7575    // CoreIPC::MessageReceiver
    76     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     76    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    7777
    7878    // Message handlers.

  • trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.h

    r141322 r141361  
    4343private:
    4444    // CoreIPC::MessageReceiver.
    45     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     45    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    4646
    4747    // WebCore::GraphicsLayerClient.

  • trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm

    r141322 r141361  
    4949}
    5050
    51 void RemoteLayerTreeHost::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder&decoder)
     51void RemoteLayerTreeHost::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder&decoder)
    5252{
    5353    didReceiveRemoteLayerTreeHostMessage(connection, decoder);

  • trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp

    r141322 r141361  
    107107}
    108108
    109 void SecItemShimProxy::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
     109void SecItemShimProxy::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
    110110{
    111111    if (decoder.messageReceiverName() == Messages::SecItemShimProxy::messageReceiverName()) {

  • trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h

    r141322 r141361  
    4444
    4545    // QueueClient
    46     virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage);
     46    virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage);
    4747
    4848    // Implemented in generated SecItemShimProxyMessageReceiver.cpp.

  • trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp

    r141322 r141361  
    5353}
    5454
    55 void WebApplicationCacheManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     55void WebApplicationCacheManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    5656{
    5757    didReceiveWebApplicationCacheManagerMessage(connection, decoder);

  • trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.h

    r141322 r141361  
    5151    void deleteEntriesForOrigin(const SecurityOriginData&);
    5252
    53     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     53    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    5454    void didReceiveWebApplicationCacheManagerMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    5555

  • trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp

    r141322 r141361  
    5959}
    6060
    61 void WebCookieManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     61void WebCookieManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    6262{
    6363    didReceiveWebCookieManagerMessage(connection, decoder);

  • trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h

    r141322 r141361  
    7070    void dispatchCookiesDidChange();
    7171
    72     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     72    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    7373    void didReceiveWebCookieManagerMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    7474

  • trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp

    r141322 r141361  
    7878}
    7979
    80 void WebFullScreenManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     80void WebFullScreenManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    8181{
    8282    didReceiveWebFullScreenManagerMessage(connection, decoder);

  • trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h

    r141322 r141361  
    5353    virtual ~WebFullScreenManager();
    5454
    55     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     55    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    5656
    5757    bool supportsFullScreen(bool withKeyboard);

  • trunk/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h

    r140607 r141361  
    5959private:
    6060    // CoreIPC::MessageReceiver
    61     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     61    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    6262
    6363    void didChangePosition(const WebGeolocationPosition::Data&);

  • trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h

    r140607 r141361  
    6565private:
    6666    // CoreIPC::MessageReceiver
    67     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     67    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    6868   
    6969    // Callbacks from the UIProcess

  • trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h

    r140607 r141361  
    4545
    4646private:
    47     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     47    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    4848
    4949    void getHostnamesWithMediaCache(uint64_t callbackID);

  • trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp

    r141322 r141361  
    5252}
    5353
    54 void NetworkProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     54void NetworkProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    5555{
    5656    if (decoder.messageReceiverName() == Messages::WebResourceLoader::messageReceiverName()) {
    … …  
    6464}
    6565
    66 void NetworkProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     66void NetworkProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    6767{
    6868    if (decoder.messageReceiverName() == Messages::WebResourceLoader::messageReceiverName()) {

  • trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h

    r139516 r141361  
    6161
    6262    // CoreIPC::Connection::Client
    63     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    64     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
     63    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
     64    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
    6565    virtual void didClose(CoreIPC::Connection*);
    6666    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;

  • trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h

    r140607 r141361  
    7474    // CoreIPC::MessageReceiver
    7575    // Implemented in generated WebNotificationManagerMessageReceiver.cpp
    76     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     76    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    7777   
    7878    void didShowNotification(uint64_t notificationID);

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp

    r141322 r141361  
    9090}
    9191
    92 void PluginProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     92void PluginProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    9393{
    9494    ASSERT(decoder.destinationID());
    … …  
    101101}
    102102
    103 void PluginProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     103void PluginProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    104104{
    105105    if (decoder.messageReceiverName() == Messages::NPObjectMessageReceiver::messageReceiverName()) {
    106         m_npRemoteObjectMap->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
     106        m_npRemoteObjectMap->didReceiveSyncMessage(connection, decoder, replyEncoder);
    107107        return;
    108108    }

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h

    r141322 r141361  
    6868
    6969    // CoreIPC::Connection::Client
    70     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    71     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
     70    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
     71    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
    7272    virtual void didClose(CoreIPC::Connection*);
    7373    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;

  • trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h

    r140607 r141361  
    4949    // CoreIPC::MessageReceiver
    5050    // Implemented in generated WebResourceCacheManagerMessageReceiver.cpp
    51     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     51    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    5252
    5353    void getCacheOrigins(uint64_t callbackID) const;

  • trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h

    r140711 r141361  
    5656
    5757    // CoreIPC::MessageReceiver
    58     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     58    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    5959
    6060    void getKeyValueStorageOrigins(uint64_t callbackID);

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp

    r141322 r141361  
    6161}
    6262
    63 void WebDatabaseManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     63void WebDatabaseManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    6464{
    6565    didReceiveWebDatabaseManagerMessage(connection, decoder);

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h

    r141322 r141361  
    5454
    5555    // CoreIPC::MessageReceiver
    56     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     56    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    5757    // Implemented in generated WebDatabaseManagerMessageReceiver.cpp
    5858    void didReceiveWebDatabaseManagerMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

    r141322 r141361  
    9595
    9696#if USE(COORDINATED_GRAPHICS)
    97     virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) = 0;
     97    virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) = 0;
    9898#endif
    9999

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

    r141171 r141361  
    727727
    728728#if USE(COORDINATED_GRAPHICS)
    729 void DrawingAreaImpl::didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     729void DrawingAreaImpl::didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    730730{
    731731    if (m_layerTreeHost)

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h

    r139023 r141361  
    8080
    8181#if USE(COORDINATED_GRAPHICS)
    82     virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     82    virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    8383#endif
    8484

  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp

    r141322 r141361  
    7474#endif
    7575
    76 void EventDispatcher::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
     76void EventDispatcher::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
    7777{
    7878    if (decoder.messageReceiverName() == Messages::EventDispatcher::messageReceiverName()) {

  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h

    r141322 r141361  
    6161private:
    6262    // CoreIPC::Connection::QueueClient
    63     virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
     63    virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
    6464
    6565    // Implemented in generated EventDispatcherMessageReceiver.cpp

  • trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h

    r141171 r141361  
    8989    virtual void renderNextFrame() { }
    9090    virtual void purgeBackingStores() { }
    91     virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) = 0;
     91    virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) = 0;
    9292#endif
    9393

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r141322 r141361  
    29862986}
    29872987
    2988 void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
     2988void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
    29892989{
    29902990    if (decoder.messageReceiverName() == Messages::DrawingArea::messageReceiverName()) {
    … …  
    30123012#if ENABLE(FULLSCREEN_API)
    30133013    if (decoder.messageReceiverName() == Messages::WebFullScreenManager::messageReceiverName()) {
    3014         fullScreenManager()->didReceiveMessage(connection, messageID, decoder);
     3014        fullScreenManager()->didReceiveMessage(connection, decoder);
    30153015        return;
    30163016    }
    … …  
    30203020}
    30213021
    3022 void WebPage::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     3022void WebPage::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    30233023{   
    30243024    didReceiveSyncWebPageMessage(connection, decoder, replyEncoder);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r141322 r141361  
    245245    void setActiveOpenPanelResultListener(PassRefPtr<WebOpenPanelResultListener>);
    246246
    247     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    248     void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
     247    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
     248    void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
    249249
    250250    // -- InjectedBundle methods

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h

    r140607 r141361  
    5555    bool isVisibleToHistoryClient() const { return m_data.visibleToHistoryClient; }
    5656   
    57     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     57    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
    5858
    5959private:

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r141322 r141361  
    585585}
    586586
    587 void WebProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
    588 {
    589     messageReceiverMap().dispatchSyncMessage(connection, messageID, decoder, replyEncoder);
    590 }
    591 
    592 void WebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
    593 {
    594     if (messageReceiverMap().dispatchMessage(connection, messageID, decoder))
     587void WebProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
     588{
     589    messageReceiverMap().dispatchSyncMessage(connection, decoder, replyEncoder);
     590}
     591
     592void WebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
     593{
     594    if (messageReceiverMap().dispatchMessage(connection, decoder))
    595595        return;
    596596
    … …  
    609609            return;
    610610       
    611         pageGroupProxy->didReceiveMessage(connection, messageID, decoder);
     611        pageGroupProxy->didReceiveMessage(connection, decoder);
    612612    }
    613613}
    … …  
    639639}
    640640
    641 void WebProcess::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
     641void WebProcess::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
    642642{
    643643    if (decoder.messageReceiverName() == Messages::WebProcess::messageReceiverName()) {

  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r141322 r141361  
    277277    // CoreIPC::Connection::Client
    278278    friend class WebConnectionToUIProcess;
    279     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    280     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
     279    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
     280    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
    281281    virtual void didClose(CoreIPC::Connection*);
    282282    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
    283283
    284284    // CoreIPC::Connection::QueueClient
    285     virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
     285    virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
    286286
    287287    // Implemented in generated WebProcessMessageReceiver.cpp
Note: See TracChangeset for help on using the changeset viewer.