Changeset 102615 in webkit


Ignore:
Timestamp:
Dec 12, 2011 1:41:04 PM (12 years ago)
Author:
andersca@apple.com
Message:

Rename QueueClient::willProcessMessageOnClientRunLoop
​https://bugs.webkit.org/show_bug.cgi?id=74325

Reviewed by Sam Weinig.

Rename the QueueClient willProcessMessageOnClientRunLoop function to didReceiveMessageOnConnectionWorkQueue
and give it an out parameter to indicate whether the message was handled or not. This makes it more clear that
the function is expected to handle the message.

  • Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::processIncomingMessage):

  • Platform/CoreIPC/Connection.h:
  • Scripts/webkit2/messages.py:

(async_case_statement):

  • Scripts/webkit2/messages_unittest.py:
  • WebProcess/WebConnectionToUIProcess.cpp:

(WebKit::WebConnectionToUIProcess::didReceiveMessageOnConnectionWorkQueue):

  • WebProcess/WebConnectionToUIProcess.h:
  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::didReceiveMessageOnConnectionWorkQueue):

  • WebProcess/WebProcess.h:
Location:
trunk/Source/WebKit2
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r102597 r102615  
     12011-12-12  Anders Carlsson  <andersca@apple.com>
     2
     3        Rename QueueClient::willProcessMessageOnClientRunLoop
     4        https://bugs.webkit.org/show_bug.cgi?id=74325
     5
     6        Reviewed by Sam Weinig.
     7
     8        Rename the QueueClient willProcessMessageOnClientRunLoop function to didReceiveMessageOnConnectionWorkQueue
     9        and give it an out parameter to indicate whether the message was handled or not. This makes it more clear that
     10        the function is expected to handle the message.
     11
     12        * Platform/CoreIPC/Connection.cpp:
     13        (CoreIPC::Connection::processIncomingMessage):
     14        * Platform/CoreIPC/Connection.h:
     15        * Scripts/webkit2/messages.py:
     16        (async_case_statement):
     17        * Scripts/webkit2/messages_unittest.py:
     18        * WebProcess/WebConnectionToUIProcess.cpp:
     19        (WebKit::WebConnectionToUIProcess::didReceiveMessageOnConnectionWorkQueue):
     20        * WebProcess/WebConnectionToUIProcess.h:
     21        * WebProcess/WebProcess.cpp:
     22        (WebKit::WebProcess::didReceiveMessageOnConnectionWorkQueue):
     23        * WebProcess/WebProcess.h:
     24
    1252011-12-12  Alexis Menard  <alexis.menard@openbossa.org>
    226

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

    r95901 r102615  
    551551    // Hand off the message to the connection queue clients.
    552552    for (size_t i = 0; i < m_connectionQueueClients.size(); ++i) {
    553         if (!m_connectionQueueClients[i]->willProcessMessageOnClientRunLoop(this, incomingMessage.messageID(), incomingMessage.arguments())) {
     553        bool didHandleMessage = false;
     554
     555        m_connectionQueueClients[i]->didReceiveMessageOnConnectionWorkQueue(this, incomingMessage.messageID(), incomingMessage.arguments(), didHandleMessage);
     556        if (didHandleMessage) {
    554557            // A connection queue client handled the message, our work here is done.
    555558            incomingMessage.releaseArguments();

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

    r101141 r102615  
    103103    class QueueClient {
    104104    public:
    105         virtual bool willProcessMessageOnClientRunLoop(Connection*, MessageID, ArgumentDecoder*) = 0;
     105        virtual void didReceiveMessageOnConnectionWorkQueue(Connection*, MessageID, ArgumentDecoder*, bool& didHandleMessage) = 0;
    106106
    107107    protected:

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

    r101307 r102615  
    312312
    313313
    314 def async_case_statement(receiver, message, return_value=None):
     314def async_case_statement(receiver, message, statement_before_return=None):
    315315    dispatch_function = 'handleMessage'
    316316    if message_is_variadic(message):
    … …  
    320320    result.append('    case Messages::%s::%s:\n' % (receiver.name, message.id()))
    321321    result.append('        CoreIPC::%s<Messages::%s::%s>(arguments, this, &%s);\n' % (dispatch_function, receiver.name, message.name, handler_function(receiver, message)))
    322     if return_value:
    323         result.append('        return %s;\n' % return_value)
    324     else:
    325         result.append('        return;\n')
     322    if statement_before_return:
     323        result.append('        %s\n' % statement_before_return)
     324    result.append('        return;\n')
    326325    return surround_in_condition(''.join(result), message.condition)
    327326
    … …  
    535534
    536535    if async_dispatch_on_connection_queue_messages:
    537         result.append('bool %s::willProcess%sMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)\n' % (receiver.name, receiver.name))
     536        result.append('void %s::didReceive%sMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)\n' % (receiver.name, receiver.name))
    538537        result.append('{\n')
    539538        result.append('#if COMPILER(MSVC)\n')
    … …  
    542541        result.append('#endif\n')
    543542        result.append('    switch (messageID.get<Messages::%s::Kind>()) {\n' % receiver.name)
    544         result += [async_case_statement(receiver, message, 'false') for message in async_dispatch_on_connection_queue_messages]
     543        result += [async_case_statement(receiver, message, 'didHandleMessage = true;') for message in async_dispatch_on_connection_queue_messages]
    545544        result.append('    default:\n')
    546         result.append('        return true;\n')
     545        result.append('        return;\n')
    547546        result.append('    }\n')
    548547        result.append('#if COMPILER(MSVC)\n')

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

    r95300 r102615  
    686686namespace WebKit {
    687687
    688 bool WebPage::willProcessWebPageMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
     688void WebPage::didReceiveWebPageMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)
    689689{
    690690#if COMPILER(MSVC)
    … …  
    695695    case Messages::WebPage::TestConnectionQueueID:
    696696        CoreIPC::handleMessage<Messages::WebPage::TestConnectionQueue>(arguments, this, &WebPage::testConnectionQueue);
    697         return false;
     697        didHandleMessage = true;
     698        return;
    698699    default:
    699         return true;
     700        return;
    700701    }
    701702#if COMPILER(MSVC)

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

    r102484 r102615  
    120120// CoreIPC::Connection::QueueClient
    121121
    122 bool WebConnectionToUIProcess::willProcessMessageOnClientRunLoop(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
     122void WebConnectionToUIProcess::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)
    123123{
    124     return m_process->willProcessMessageOnClientRunLoop(connection, messageID, arguments);
     124    m_process->didReceiveWebProcessMessageOnConnectionWorkQueue(connection, messageID, arguments, didHandleMessage);
    125125}
    126126

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

    r102014 r102615  
    5959
    6060    // CoreIPC::Connection::QueueClient
    61     virtual bool willProcessMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
     61    virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, bool& didHandleMessage) OVERRIDE;
    6262
    6363    WebProcess* m_process;

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

    r102235 r102615  
    697697}
    698698
    699 bool WebProcess::willProcessMessageOnClientRunLoop(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
    700 {
    701     if (messageID.is<CoreIPC::MessageClassWebProcess>())
    702         return willProcessWebProcessMessageOnClientRunLoop(connection, messageID, arguments);
    703 
    704     return true;
     699void WebProcess::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)
     700{
     701    if (messageID.is<CoreIPC::MessageClassWebProcess>()) {
     702        didReceiveWebProcessMessageOnConnectionWorkQueue(connection, messageID, arguments, didHandleMessage);
     703        return;
     704    }
    705705}
    706706

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

    r102484 r102615  
    213213
    214214    // CoreIPC::Connection::QueueClient
    215     virtual bool willProcessMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
    216 
     215    virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, bool& didHandleMessage) OVERRIDE;
    217216
    218217    // Implemented in generated WebProcessMessageReceiver.cpp
    219     bool willProcessWebProcessMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
    220218    void didReceiveWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
     219    void didReceiveWebProcessMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, bool& didHandleMessage);
    221220
    222221    RefPtr<WebConnectionToUIProcess> m_connection;
Note: See TracChangeset for help on using the changeset viewer.