Changeset 104623 in webkit

Timestamp:

Jan 10, 2012, 1:14:16 PM (14 years ago)

Author:

andersca@apple.com

Message:

DispatchOnConnectionQueue messages should have a Connection parameter
​https://bugs.webkit.org/show_bug.cgi?id=75986

Reviewed by Adam Roben.

Message handlers for messages with the DispatchOnConnectionQueue should have a CoreIPC::Connection
parameter, making it easier to send messages back over that connection.

• Platform/CoreIPC/HandleMessage.h:

(CoreIPC::callMemberFunction):
(CoreIPC::handleMessageOnConnectionQueue):

• Scripts/webkit2/messages.py:

(async_case_statement):
(generate_message_handler):

• Scripts/webkit2/messages_unittest.py:
• WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::wheelEvent):
(WebKit::EventDispatcher::gestureEvent):

• WebProcess/WebPage/EventDispatcher.h:
• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::pluginProcessCrashed):

• WebProcess/WebProcess.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/HandleMessage.h (modified) (2 diffs)
• Scripts/webkit2/messages.py (modified) (3 diffs)
• Scripts/webkit2/messages_unittest.py (modified) (2 diffs)
• WebProcess/WebPage/EventDispatcher.cpp (modified) (2 diffs)
• WebProcess/WebPage/EventDispatcher.h (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (1 diff)
• WebProcess/WebProcess.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-10  Anders Carlsson  <andersca@apple.com>
+
+        DispatchOnConnectionQueue messages should have a Connection parameter
+        https://bugs.webkit.org/show_bug.cgi?id=75986
+
+        Reviewed by Adam Roben.
+
+        Message handlers for messages with the DispatchOnConnectionQueue should have a CoreIPC::Connection
+        parameter, making it easier to send messages back over that connection.
+
+        * Platform/CoreIPC/HandleMessage.h:
+        (CoreIPC::callMemberFunction):
+        (CoreIPC::handleMessageOnConnectionQueue):
+        * Scripts/webkit2/messages.py:
+        (async_case_statement):
+        (generate_message_handler):
+        * Scripts/webkit2/messages_unittest.py:
+        * WebProcess/WebPage/EventDispatcher.cpp:
+        (WebKit::EventDispatcher::wheelEvent):
+        (WebKit::EventDispatcher::gestureEvent):
+        * WebProcess/WebPage/EventDispatcher.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::pluginProcessCrashed):
+        * WebProcess/WebProcess.h:
+
 2012-01-10  Chris Marrin  <cmarrin@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/HandleMessage.h

@@ -197 +197 @@
 }
 
+// Dispatch functions with connection parameter.
+template<typename C, typename MF, typename P1>
+void callMemberFunction(Connection* connection, const Arguments1<P1>& args, C* object, MF function)
+{
+    (object->*function)(connection, args.argument1);
+}
+
+template<typename C, typename MF, typename P1, typename P2>
+void callMemberFunction(Connection* connection, const Arguments2<P1, P2>& args, C* object, MF function)
+{
+    (object->*function)(connection, args.argument1, args.argument2);
+}
+
 // Variadic dispatch functions.
 
@@ -291 +304 @@
 
 template<typename T, typename C, typename MF>
+void handleMessageOnConnectionQueue(Connection* connection, ArgumentDecoder* argumentDecoder, C* object, MF function)
+{
+    typename T::DecodeType::ValueType arguments;
+    if (!argumentDecoder->decode(arguments))
+        return;
+    callMemberFunction(connection, arguments, object, function);
+}
+
+template<typename T, typename C, typename MF>
 void handleMessageVariadic(ArgumentDecoder* argumentDecoder, C* object, MF function)
 {

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

@@ -312 +312 @@
 
 
-def async_case_statement(receiver, message, statement_before_return=None):
+def async_case_statement(receiver, message):
+    dispatch_function_args = ['arguments', 'this', '&%s' % handler_function(receiver, message)]
     dispatch_function = 'handleMessage'
     if message_is_variadic(message):
         dispatch_function += 'Variadic'
-
+    if message.has_attribute(DISPATCH_ON_CONNECTION_QUEUE_ATTRIBUTE):
+        dispatch_function += 'OnConnectionQueue'
+        dispatch_function_args.insert(0, 'connection')
+        
     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 statement_before_return:
-        result.append('        %s\n' % statement_before_return)
+
+    result.append('        CoreIPC::%s<Messages::%s::%s>(%s);\n' % (dispatch_function, receiver.name, message.name, ', '.join(dispatch_function_args)))
+    if message.has_attribute(DISPATCH_ON_CONNECTION_QUEUE_ATTRIBUTE):
+        result.append('        didHandleMessage = true;\n')
     result.append('        return;\n')
     return surround_in_condition(''.join(result), message.condition)
@@ -534 +539 @@
 
     if async_dispatch_on_connection_queue_messages:
-        result.append('void %s::didReceive%sMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)\n' % (receiver.name, receiver.name))
+        result.append('void %s::didReceive%sMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)\n' % (receiver.name, receiver.name))
         result.append('{\n')
         result.append('#if COMPILER(MSVC)\n')
@@ -541 +546 @@
         result.append('#endif\n')
         result.append('    switch (messageID.get<Messages::%s::Kind>()) {\n' % receiver.name)
-        result += [async_case_statement(receiver, message, 'didHandleMessage = true;') for message in async_dispatch_on_connection_queue_messages]
+        result += [async_case_statement(receiver, message) for message in async_dispatch_on_connection_queue_messages]
         result.append('    default:\n')
         result.append('        return;\n')

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

@@ -686 +686 @@
 namespace WebKit {
 
-void WebPage::didReceiveWebPageMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)
+void WebPage::didReceiveWebPageMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments, bool& didHandleMessage)
 {
 #if COMPILER(MSVC)
@@ -694 +694 @@
     switch (messageID.get<Messages::WebPage::Kind>()) {
     case Messages::WebPage::TestConnectionQueueID:
-        CoreIPC::handleMessage<Messages::WebPage::TestConnectionQueue>(arguments, this, &WebPage::testConnectionQueue);
+        CoreIPC::handleMessageOnConnectionQueue<Messages::WebPage::TestConnectionQueue>(connection, arguments, this, &WebPage::testConnectionQueue);
         didHandleMessage = true;
         return;

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

@@ -79 +79 @@
 }
 
-void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent)
+void EventDispatcher::wheelEvent(CoreIPC::Connection*, uint64_t pageID, const WebWheelEvent& wheelEvent)
 {
 #if ENABLE(THREADED_SCROLLING)
@@ -97 +97 @@
 
 #if ENABLE(GESTURE_EVENTS)
-void EventDispatcher::gestureEvent(uint64_t pageID, const WebGestureEvent& gestureEvent)
+void EventDispatcher::gestureEvent(CoreIPC::Connection*, uint64_t pageID, const WebGestureEvent& gestureEvent)
 {
 #if ENABLE(THREADED_SCROLLING)

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

@@ -67 +67 @@
 
     // Message handlers
-    void wheelEvent(uint64_t pageID, const WebWheelEvent&);
+    void wheelEvent(CoreIPC::Connection*, uint64_t pageID, const WebWheelEvent&);
 #if ENABLE(GESTURE_EVENTS)
-    void gestureEvent(uint64_t pageID, const WebGestureEvent&);
+    void gestureEvent(CoreIPC::Connection*, uint64_t pageID, const WebGestureEvent&);
 #endif
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -950 +950 @@
 
 #if ENABLE(PLUGIN_PROCESS)
-void WebProcess::pluginProcessCrashed(const String& pluginPath)
+void WebProcess::pluginProcessCrashed(CoreIPC::Connection*, const String& pluginPath)
 {
     m_pluginProcessConnectionManager.pluginProcessCrashed(pluginPath);

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -183 +183 @@
     
 #if ENABLE(PLUGIN_PROCESS)
-    void pluginProcessCrashed(const String& pluginPath);
+    void pluginProcessCrashed(CoreIPC::Connection*, const String& pluginPath);
 #endif