Changeset 83350 in webkit

Timestamp:

Apr 8, 2011 3:39:00 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-08 Anders Carlsson <​andersca@apple.com>

Reviewed by Adam Roben.

Parse 'DispatchOnConnectionQueue' in messages.in files
​https://bugs.webkit.org/show_bug.cgi?id=58168

Handle parsing multiple, space-separated attributes in .messages.in files. Keep track of
'DispatchOnConnectionQueue' and rename 'delayed' to 'Delayed'.

• Scripts/webkit2/messages.py:
• Scripts/webkit2/messages_unittest.py:

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-08  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Parse 'DispatchOnConnectionQueue' in messages.in files
+        https://bugs.webkit.org/show_bug.cgi?id=58168
+
+        Handle parsing multiple, space-separated attributes in .messages.in files. Keep track of
+        'DispatchOnConnectionQueue' and rename 'delayed' to 'Delayed'.
+
+        * Scripts/webkit2/messages.py:
+        * Scripts/webkit2/messages_unittest.py:
+
 2011-04-08  Alpha Lam  <hclam@chromium.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+(delayed))?)?', line)
+            match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\)(?:\s+(.*))?)?', line)
             if match:
-                name, parameters_string, reply_parameters_string, delayed_string = match.groups()
+                name, parameters_string, reply_parameters_string, attributes_string = match.groups()
                 if parameters_string:
                     parameters = parse_parameter_string(parameters_string)
@@ -93 +93 @@
                     parameter.condition = condition
 
-                delayed = delayed_string == 'delayed'
+                if attributes_string:
+                    attributes = frozenset(attributes_string.split())
+                    delayed = "Delayed" in attributes
+                    dispatch_on_connection_queue = "DispatchOnConnectionQueue" in attributes
+                else:
+                    delayed = False
+                    dispatch_on_connection_queue = False
 
                 if reply_parameters_string:
@@ -102 +108 @@
                     reply_parameters = None
 
-                messages.append(Message(name, parameters, reply_parameters, delayed, condition))
+                messages.append(Message(name, parameters, reply_parameters, delayed, dispatch_on_connection_queue, condition))
         return MessageReceiver(destination, messages, master_condition)
 
 
 class Message(object):
-    def __init__(self, name, parameters, reply_parameters, delayed, condition):
+    def __init__(self, name, parameters, reply_parameters, delayed, dispatch_on_connection_queue, condition):
         self.name = name
         self.parameters = parameters
@@ -113 +119 @@
         if self.reply_parameters is not None:
             self.delayed = delayed
+        self.dispatch_on_connection_queue = dispatch_on_connection_queue
         self.condition = condition
         if len(self.parameters) != 0:

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

@@ -66 +66 @@
     CreatePlugin(uint64_t pluginInstanceID, WebKit::Plugin::Parameters parameters) -> (bool result)
     RunJavaScriptAlert(uint64_t frameID, WTF::String message) -> ()
-    GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins)
-    GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) delayed
+    GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins) DispatchOnConnectionQueue
+    GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) Delayed
+
+    TestMultipleAttributes() -> () DispatchOnConnectionQueue Delayed
 
 #if PLATFORM(MAC)
@@ -174 +176 @@
             'reply_parameters': (
                 ('CoreIPC::Connection::Handle', 'connectionHandle'),
+            ),
+            'condition': None,
+        },
+        {
+            'name': 'TestMultipleAttributes',
+            'parameters': (
+            ),
+            'reply_parameters': (
             ),
             'condition': None,
@@ -294 +304 @@
     GetPluginsID,
     GetPluginProcessConnectionID,
+    TestMultipleAttributesID,
 #if PLATFORM(MAC)
     DidCreateWebProcessConnectionID,
@@ -421 +432 @@
     {
     }
+};
+
+struct TestMultipleAttributes : CoreIPC::Arguments0 {
+    static const Kind messageID = TestMultipleAttributesID;
+    struct DelayedReply {
+        DelayedReply(PassRefPtr<CoreIPC::Connection> connection, PassOwnPtr<CoreIPC::ArgumentDecoder> arguments)
+            : m_connection(connection)
+            , m_arguments(arguments)
+        {
+        }
+
+        bool send()
+        {
+            ASSERT(m_arguments);
+            bool result = m_connection->sendSyncReply(m_arguments.release());
+            m_connection = nullptr;
+            return result;
+        }
+
+    private:
+        RefPtr<CoreIPC::Connection> m_connection;
+        OwnPtr<CoreIPC::ArgumentDecoder> m_arguments;
+    };
+
+    typedef CoreIPC::Arguments0 DecodeType;
 };
 
@@ -567 +603 @@
         CoreIPC::handleMessage<Messages::WebPage::GetPluginProcessConnection>(arguments, reply, this, &WebPage::getPluginProcessConnection);
         return CoreIPC::AutomaticReply;
+    case Messages::WebPage::TestMultipleAttributesID:
+        CoreIPC::handleMessage<Messages::WebPage::TestMultipleAttributes>(arguments, reply, this, &WebPage::testMultipleAttributes);
+        return CoreIPC::AutomaticReply;
 #if PLATFORM(MAC)
     case Messages::WebPage::InterpretKeyEventID: