Changeset 161474 in webkit

Timestamp:

Jan 7, 2014 5:03:48 PM (10 years ago)

Author:

Simon Fraser

Message:

Make it possible for MessageReceivers to pass messages to their superclass, and use it for RemoteLayerTreeDrawingAreaProxy
​https://bugs.webkit.org/show_bug.cgi?id=126558

Reviewed by Anders Carlsson.

In a message.in file it's now possible to say:

messages -> Subclass : Superclass { ... } and the generated code will
call Superclass::didReceiveMessage().

Use this to have RemoteLayerTreeDrawingAreaProxy pass messages up to
DrawingAreaProxy.

• Scripts/webkit2/messages.py:

(generate_message_handler):

• Scripts/webkit2/model.py:

(MessageReceiver.init):

• Scripts/webkit2/parser.py:

(parse):

• UIProcess/DrawingAreaProxy.h:
• UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkit2/MessageReceiverSuperclass-expected.cpp (added)
• Scripts/webkit2/MessagesSuperclass-expected.h (added)
• Scripts/webkit2/messages.py (modified) (1 diff)
• Scripts/webkit2/messages_unittest.py (modified) (6 diffs)
• Scripts/webkit2/model.py (modified) (1 diff)
• Scripts/webkit2/parser.py (modified) (2 diffs)
• Scripts/webkit2/test-superclass-messages.in (copied) (copied from trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in) (2 diffs)
• UIProcess/DrawingAreaProxy.h (modified) (1 diff)
• UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Make it possible for MessageReceivers to pass messages to their superclass, and use it for RemoteLayerTreeDrawingAreaProxy
+        https://bugs.webkit.org/show_bug.cgi?id=126558
+
+        Reviewed by Anders Carlsson.
+        
+        In a message.in file it's now possible to say:
+        
+        messages -> Subclass : Superclass { ... } and the generated code will
+        call Superclass::didReceiveMessage().
+        
+        Use this to have RemoteLayerTreeDrawingAreaProxy pass messages up to
+        DrawingAreaProxy.
+
+        * Scripts/webkit2/messages.py:
+        (generate_message_handler):
+        * Scripts/webkit2/model.py:
+        (MessageReceiver.__init__):
+        * Scripts/webkit2/parser.py:
+        (parse):
+        * UIProcess/DrawingAreaProxy.h:
+        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in:
+
 2014-01-07  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -596 +596 @@
         result.append('{\n')
         result += [async_message_statement(receiver, message) for message in async_messages]
-        if not receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE):
-            result.append('    UNUSED_PARAM(connection);\n')
-        result.append('    ASSERT_NOT_REACHED();\n')
+        if (receiver.superclass):
+            result.append('    %s::didReceiveMessage(connection, decoder);\n' % (receiver.superclass))
+        else:
+            if not receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE):
+                result.append('    UNUSED_PARAM(connection);\n')
+            result.append('    ASSERT_NOT_REACHED();\n')
         result.append('}\n')
 

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

@@ -32 +32 @@
 script_directory = os.path.dirname(os.path.realpath(__file__))
 
+with open(os.path.join(script_directory, 'test-messages.in')) as file:
+    _messages_file_contents = file.read()
+
 with open(os.path.join(script_directory, 'test-legacy-messages.in')) as file:
     _legacy_messages_file_contents = file.read()
 
-with open(os.path.join(script_directory, 'test-messages.in')) as file:
-    _messages_file_contents = file.read()
+with open(os.path.join(script_directory, 'test-superclass-messages.in')) as file:
+    _superclass_messages_file_contents = file.read()
+
+
+with open(os.path.join(script_directory, 'Messages-expected.h')) as file:
+    _expected_receiver_header = file.read()
 
 with open(os.path.join(script_directory, 'LegacyMessages-expected.h')) as file:
     _expected_legacy_receiver_header = file.read()
 
-with open(os.path.join(script_directory, 'Messages-expected.h')) as file:
-    _expected_receiver_header = file.read()
+with open(os.path.join(script_directory, 'MessagesSuperclass-expected.h')) as file:
+    _expected_superclass_receiver_header = file.read()
+    
 
 with open(os.path.join(script_directory, 'MessageReceiver-expected.cpp')) as file:
@@ -49 +57 @@
 with open(os.path.join(script_directory, 'LegacyMessageReceiver-expected.cpp')) as file:
     _expected_legacy_receiver_implementation = file.read()
+
+with open(os.path.join(script_directory, 'MessageReceiverSuperclass-expected.cpp')) as file:
+    _expected_superclass_receiver_implementation = file.read()
 
 _expected_results = {
@@ -224 +235 @@
 }
 
+_expected_superclass_results = {
+    'name': 'WebPage',
+    'superclass' : 'WebPageBase',
+    'conditions': None,
+    'messages': (
+        {
+            'name': 'LoadURL',
+            'parameters': (
+                ('String', 'url'),
+            ),
+            'conditions': (None),
+        },
+    ),
+}
+
 
 class MessagesTest(unittest.TestCase):
@@ -229 +255 @@
         self.receiver = parser.parse(StringIO(_messages_file_contents))
         self.legacy_receiver = parser.parse(StringIO(_legacy_messages_file_contents))
+        self.superclass_receiver = parser.parse(StringIO(_superclass_messages_file_contents))
 
 
@@ -267 +294 @@
             self.check_message(message, _expected_results['messages'][index])
 
+        self.assertEquals(self.superclass_receiver.name, _expected_superclass_results['name'])
+        self.assertEquals(self.superclass_receiver.superclass, _expected_superclass_results['superclass'])
+        self.assertEquals(len(self.superclass_receiver.messages), len(_expected_superclass_results['messages']))
+        for index, message in enumerate(self.superclass_receiver.messages):
+            self.check_message(message, _expected_superclass_results['messages'][index])
+
 
 
@@ -282 +315 @@
 class HeaderTest(GeneratedFileContentsTest):
     def test_header(self):
+        file_contents = messages.generate_messages_header(StringIO(_messages_file_contents))
+        self.assertGeneratedFileContentsEqual(file_contents, _expected_receiver_header)
+
         legacy_file_contents = messages.generate_messages_header(StringIO(_legacy_messages_file_contents))
         self.assertGeneratedFileContentsEqual(legacy_file_contents, _expected_legacy_receiver_header)
 
-        file_contents = messages.generate_messages_header(StringIO(_messages_file_contents))
-        self.assertGeneratedFileContentsEqual(file_contents, _expected_receiver_header)
+        superclass_file_contents = messages.generate_messages_header(StringIO(_superclass_messages_file_contents))
+        self.assertGeneratedFileContentsEqual(superclass_file_contents, _expected_superclass_receiver_header)
 
 
 class ReceiverImplementationTest(GeneratedFileContentsTest):
     def test_receiver_implementation(self):
+        file_contents = messages.generate_message_handler(StringIO(_messages_file_contents))
+        self.assertGeneratedFileContentsEqual(file_contents, _expected_receiver_implementation)
+
         legacy_file_contents = messages.generate_message_handler(StringIO(_legacy_messages_file_contents))
         self.assertGeneratedFileContentsEqual(legacy_file_contents, _expected_legacy_receiver_implementation)
 
-        file_contents = messages.generate_message_handler(StringIO(_messages_file_contents))
-        self.assertGeneratedFileContentsEqual(file_contents, _expected_receiver_implementation)
+        superclass_file_contents = messages.generate_message_handler(StringIO(_superclass_messages_file_contents))
+        self.assertGeneratedFileContentsEqual(superclass_file_contents, _expected_superclass_receiver_implementation)
 
 

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

@@ -25 +25 @@
 
 class MessageReceiver(object):
-    def __init__(self, name, attributes, messages, condition):
+    def __init__(self, name, superclass, attributes, messages, condition):
         self.name = name
+        self.superclass = superclass
         self.attributes = frozenset(attributes or [])
         self.messages = messages

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

@@ -49 +49 @@
     conditions = []
     master_condition = None
+    superclass = []
     for line in file:
-        match = re.search(r'messages -> (?P<destination>[A-Za-z_0-9]+) \s*(?:(?P<attributes>.*?)\s+)?{', line)
+        match = re.search(r'messages -> (?P<destination>[A-Za-z_0-9]+) \s*(?::\s*(?P<superclass>.*?) \s*)?(?:(?P<attributes>.*?)\s+)?{', line)
         if match:
             receiver_attributes = parse_attributes_string(match.group('attributes'))
-
+            if match.group('superclass'):
+                superclass = match.group('superclass')
             if conditions:
                 master_condition = conditions
@@ -90 +92 @@
 
             messages.append(model.Message(name, parameters, reply_parameters, attributes, combine_condition(conditions)))
-    return model.MessageReceiver(destination, receiver_attributes, messages, combine_condition(master_condition))
+    return model.MessageReceiver(destination, superclass, receiver_attributes, messages, combine_condition(master_condition))
 
 

trunk/Source/WebKit2/Scripts/webkit2/test-superclass-messages.in

@@ -1 @@
-# Copyright (C) 2014 Apple Inc. All rights reserved.
+# Copyright (C) 2010 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -21 +21 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-messages -> RemoteLayerTreeDrawingAreaProxy {
-    void CommitLayerTree(WebKit::RemoteLayerTreeTransaction layerTreeTransaction, WebKit::RemoteScrollingCoordinatorTransaction scrollingTreeTransaction)
+messages -> WebPage : WebPageBase {
+    LoadURL(String url)
 }

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h

@@ -83 +83 @@
     WebCore::IntSize m_scrollOffset;
 
+    // IPC::MessageReceiver
+    virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+
 private:
     virtual void sizeDidChange() = 0;
-
-    // IPC::MessageReceiver
-    virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
 
     // Message handlers.

trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in

@@ -21 +21 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-messages -> RemoteLayerTreeDrawingAreaProxy {
+messages -> RemoteLayerTreeDrawingAreaProxy : DrawingAreaProxy {
     void CommitLayerTree(WebKit::RemoteLayerTreeTransaction layerTreeTransaction, WebKit::RemoteScrollingCoordinatorTransaction scrollingTreeTransaction)
 }