Diff
Modified: trunk/Source/WebKit2/ChangeLog (102614 => 102615)
--- trunk/Source/WebKit2/ChangeLog 2011-12-12 21:26:28 UTC (rev 102614)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-12 21:41:04 UTC (rev 102615)
@@ -1,3 +1,27 @@
+2011-12-12 Anders Carlsson <[email protected]>
+
+ 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:
+
2011-12-12 Alexis Menard <[email protected]>
Unreviewed cleanup fix.
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp (102614 => 102615)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2011-12-12 21:26:28 UTC (rev 102614)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2011-12-12 21:41:04 UTC (rev 102615)
@@ -550,7 +550,10 @@
// Hand off the message to the connection queue clients.
for (size_t i = 0; i < m_connectionQueueClients.size(); ++i) {
- if (!m_connectionQueueClients[i]->willProcessMessageOnClientRunLoop(this, incomingMessage.messageID(), incomingMessage.arguments())) {
+ bool didHandleMessage = false;
+
+ m_connectionQueueClients[i]->didReceiveMessageOnConnectionWorkQueue(this, incomingMessage.messageID(), incomingMessage.arguments(), didHandleMessage);
+ if (didHandleMessage) {
// A connection queue client handled the message, our work here is done.
incomingMessage.releaseArguments();
return;
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.h (102614 => 102615)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2011-12-12 21:26:28 UTC (rev 102614)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2011-12-12 21:41:04 UTC (rev 102615)
@@ -102,7 +102,7 @@
class QueueClient {
public:
- virtual bool willProcessMessageOnClientRunLoop(Connection*, MessageID, ArgumentDecoder*) = 0;
+ virtual void didReceiveMessageOnConnectionWorkQueue(Connection*, MessageID, ArgumentDecoder*, bool& didHandleMessage) = 0;
protected:
virtual ~QueueClient() { }
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (102614 => 102615)
--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2011-12-12 21:26:28 UTC (rev 102614)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2011-12-12 21:41:04 UTC (rev 102615)
@@ -311,7 +311,7 @@
return '%s::%s' % (receiver.name, message.name[0].lower() + message.name[1:])
-def async_case_statement(receiver, message, return_value=None):
+def async_case_statement(receiver, message, statement_before_return=None):
dispatch_function = 'handleMessage'
if message_is_variadic(message):
dispatch_function += 'Variadic'
@@ -319,10 +319,9 @@
result = []
result.append(' case Messages::%s::%s:\n' % (receiver.name, message.id()))
result.append(' CoreIPC::%s<Messages::%s::%s>(arguments, this, &%s);\n' % (dispatch_function, receiver.name, message.name, handler_function(receiver, message)))
- if return_value:
- result.append(' return %s;\n' % return_value)
- else:
- result.append(' return;\n')
+ if statement_before_return:
+ result.append(' %s\n' % statement_before_return)
+ result.append(' return;\n')
return surround_in_condition(''.join(result), message.condition)
@@ -534,16 +533,16 @@
async_messages.append(message)
if async_dispatch_on_connection_queue_messages:
- result.append('bool %s::willProcess%sMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)\n' % (receiver.name, receiver.name))
+ result.append('void %s::didReceive%sMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)\n' % (receiver.name, receiver.name))
result.append('{\n')
result.append('#if COMPILER(MSVC)\n')
result.append('#pragma warning(push)\n')
result.append('#pragma warning(disable: 4065)\n')
result.append('#endif\n')
result.append(' switch (messageID.get<Messages::%s::Kind>()) {\n' % receiver.name)
- result += [async_case_statement(receiver, message, 'false') for message in async_dispatch_on_connection_queue_messages]
+ result += [async_case_statement(receiver, message, 'didHandleMessage = true;') for message in async_dispatch_on_connection_queue_messages]
result.append(' default:\n')
- result.append(' return true;\n')
+ result.append(' return;\n')
result.append(' }\n')
result.append('#if COMPILER(MSVC)\n')
result.append('#pragma warning(pop)\n')
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py (102614 => 102615)
--- trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2011-12-12 21:26:28 UTC (rev 102614)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2011-12-12 21:41:04 UTC (rev 102615)
@@ -685,7 +685,7 @@
namespace WebKit {
-bool WebPage::willProcessWebPageMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
+void WebPage::didReceiveWebPageMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)
{
#if COMPILER(MSVC)
#pragma warning(push)
@@ -694,9 +694,10 @@
switch (messageID.get<Messages::WebPage::Kind>()) {
case Messages::WebPage::TestConnectionQueueID:
CoreIPC::handleMessage<Messages::WebPage::TestConnectionQueue>(arguments, this, &WebPage::testConnectionQueue);
- return false;
+ didHandleMessage = true;
+ return;
default:
- return true;
+ return;
}
#if COMPILER(MSVC)
#pragma warning(pop)
Modified: trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp (102614 => 102615)
--- trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp 2011-12-12 21:26:28 UTC (rev 102614)
+++ trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp 2011-12-12 21:41:04 UTC (rev 102615)
@@ -119,9 +119,9 @@
// CoreIPC::Connection::QueueClient
-bool WebConnectionToUIProcess::willProcessMessageOnClientRunLoop(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
+void WebConnectionToUIProcess::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)
{
- return m_process->willProcessMessageOnClientRunLoop(connection, messageID, arguments);
+ m_process->didReceiveWebProcessMessageOnConnectionWorkQueue(connection, messageID, arguments, didHandleMessage);
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h (102614 => 102615)
--- trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h 2011-12-12 21:26:28 UTC (rev 102614)
+++ trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h 2011-12-12 21:41:04 UTC (rev 102615)
@@ -58,7 +58,7 @@
#endif
// CoreIPC::Connection::QueueClient
- virtual bool willProcessMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+ virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, bool& didHandleMessage) OVERRIDE;
WebProcess* m_process;
RefPtr<CoreIPC::Connection> m_connection;
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (102614 => 102615)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2011-12-12 21:26:28 UTC (rev 102614)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2011-12-12 21:41:04 UTC (rev 102615)
@@ -696,12 +696,12 @@
{
}
-bool WebProcess::willProcessMessageOnClientRunLoop(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
+void WebProcess::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)
{
- if (messageID.is<CoreIPC::MessageClassWebProcess>())
- return willProcessWebProcessMessageOnClientRunLoop(connection, messageID, arguments);
-
- return true;
+ if (messageID.is<CoreIPC::MessageClassWebProcess>()) {
+ didReceiveWebProcessMessageOnConnectionWorkQueue(connection, messageID, arguments, didHandleMessage);
+ return;
+ }
}
WebFrame* WebProcess::webFrame(uint64_t frameID) const
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (102614 => 102615)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2011-12-12 21:26:28 UTC (rev 102614)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2011-12-12 21:41:04 UTC (rev 102615)
@@ -212,12 +212,11 @@
#endif
// CoreIPC::Connection::QueueClient
- virtual bool willProcessMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+ virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, bool& didHandleMessage) OVERRIDE;
-
// Implemented in generated WebProcessMessageReceiver.cpp
- bool willProcessWebProcessMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
void didReceiveWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+ void didReceiveWebProcessMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, bool& didHandleMessage);
RefPtr<WebConnectionToUIProcess> m_connection;
