Changeset 85519 in webkit

Timestamp:

May 2, 2011 2:04:58 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-02 Anders Carlsson <​andersca@apple.com>

Reviewed by Adam Roben.

Handle DispatchOnConnectionQueue for asynchronous messages
​https://bugs.webkit.org/show_bug.cgi?id=59959

If any asynchronous messages have the DispatchOnConnectionQueue attribute,
create a new willProcess{Receiver}MessageOnClientRunLoop.

• Scripts/webkit2/messages.py:
• Fix a regex bug where we would only parse attributes on synchronous messages.
• Collect messages with the dispatch_on_connection_queue flag set. We only handle asynchronous messages currently; sync message support will be added when/if the need arises.

• Scripts/webkit2/messages_unittest.py: Update test.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkit2/messages.py (modified) (4 diffs)
• Scripts/webkit2/messages_unittest.py (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-02  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Handle DispatchOnConnectionQueue for asynchronous messages
+        https://bugs.webkit.org/show_bug.cgi?id=59959
+
+        If any asynchronous messages have the DispatchOnConnectionQueue attribute, 
+        create a new willProcess{Receiver}MessageOnClientRunLoop.
+
+        * Scripts/webkit2/messages.py:
+        - Fix a regex bug where we would only parse attributes on synchronous messages.
+        - Collect messages with the dispatch_on_connection_queue flag set. We only handle
+          asynchronous messages currently; sync message support will be added when/if the
+          need arises.
+
+        * Scripts/webkit2/messages_unittest.py:
+        Update test.
+
 2011-05-02  Adam Barth  <abarth@webkit.org>
 

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

@@ -82 +82 @@
                     condition = None
                 continue
-            match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\)(?:\s+(.*))?)?', line)
+            match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\))?(?:\s+(.*))?', line)
             if match:
                 name, parameters_string, reply_parameters_string, attributes_string = match.groups()
@@ -376 +376 @@
 
 
-def async_case_statement(receiver, message):
+def async_case_statement(receiver, message, return_value=None):
     dispatch_function = 'handleMessage'
     if message.is_variadic:
@@ -384 +384 @@
     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)))
-    result.append('        return;\n')
+    if return_value:
+        result.append('        return %s;\n' % return_value)
+    else:
+        result.append('        return;\n')
     return surround_in_condition(''.join(result), message.condition)
 
@@ -572 +575 @@
     result.append('namespace WebKit {\n\n')
 
+    async_dispatch_on_connection_queue_messages = []
+    sync_dispatch_on_connection_queue_messages = []
     async_messages = []
     sync_messages = []
     for message in receiver.messages:
         if message.reply_parameters is not None:
-            sync_messages.append(message)
+            if message.dispatch_on_connection_queue:
+                sync_dispatch_on_connection_queue_messages.append(message)
+            else:
+                sync_messages.append(message)
         else:
-            async_messages.append(message)
+            if message.dispatch_on_connection_queue:
+                async_dispatch_on_connection_queue_messages.append(message)
+            else:
+                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('{\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.append('    default:\n')
+        result.append('        return true;\n')
+        result.append('    }\n')
+        result.append('}\n\n')
 
     if async_messages:

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

@@ -70 +70 @@
 
     TestMultipleAttributes() -> () DispatchOnConnectionQueue Delayed
+    TestConnectionQueue(uint64_t pluginID) DispatchOnConnectionQueue
 
 #if PLATFORM(MAC)
@@ -184 +185 @@
             ),
             'reply_parameters': (
+            ),
+            'condition': None,
+        },
+        {
+            'name': 'TestConnectionQueue',
+            'parameters': (
+                ('uint64_t', 'pluginID'),
             ),
             'condition': None,
@@ -308 +316 @@
     GetPluginProcessConnectionID,
     TestMultipleAttributesID,
+    TestConnectionQueueID,
 #if PLATFORM(MAC)
     DidCreateWebProcessConnectionID,
@@ -443 +452 @@
     typedef CoreIPC::Arguments0 Reply;
     typedef CoreIPC::Arguments0 DecodeType;
+};
+
+struct TestConnectionQueue : CoreIPC::Arguments1<uint64_t> {
+    static const Kind messageID = TestConnectionQueueID;
+    typedef CoreIPC::Arguments1<uint64_t> DecodeType;
+    explicit TestConnectionQueue(uint64_t pluginID)
+        : CoreIPC::Arguments1<uint64_t>(pluginID)
+    {
+    }
 };
 
@@ -583 +601 @@
 namespace WebKit {
 
+bool WebPage::willProcessWebPageMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
+{
+    switch (messageID.get<Messages::WebPage::Kind>()) {
+    case Messages::WebPage::TestConnectionQueueID:
+        CoreIPC::handleMessage<Messages::WebPage::TestConnectionQueue>(arguments, this, &WebPage::testConnectionQueue);
+        return false;
+    default:
+        return true;
+    }
+}
+
 void WebPage::didReceiveWebPageMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
 {
@@ -630 +659 @@
         CoreIPC::handleMessage<Messages::WebPage::RunJavaScriptAlert>(arguments, reply, this, &WebPage::runJavaScriptAlert);
         return CoreIPC::AutomaticReply;
-    case Messages::WebPage::GetPluginsID:
-        CoreIPC::handleMessage<Messages::WebPage::GetPlugins>(arguments, reply, this, &WebPage::getPlugins);
-        return CoreIPC::AutomaticReply;
     case Messages::WebPage::GetPluginProcessConnectionID:
         CoreIPC::handleMessageDelayed<Messages::WebPage::GetPluginProcessConnection>(connection, arguments, reply, this, &WebPage::getPluginProcessConnection);
-        return CoreIPC::ManualReply;
-    case Messages::WebPage::TestMultipleAttributesID:
-        CoreIPC::handleMessageDelayed<Messages::WebPage::TestMultipleAttributes>(connection, arguments, reply, this, &WebPage::testMultipleAttributes);
         return CoreIPC::ManualReply;
 #if PLATFORM(MAC)