Changeset 245749 in webkit

Timestamp:

May 24, 2019, 11:55:28 AM (7 years ago)

Author:

youenn@apple.com

Message:

Update messages_unittest.py after r245715
​https://bugs.webkit.org/show_bug.cgi?id=198214

Reviewed by Alexey Proskuryakov.

Update expected results for messages.py output.i
Small refactoring to messages.py: instead of calling the completionHandler in case of decoding error with AsyncReply errors,
call cancelReply directly as it does the same thing.

• Scripts/webkit/MessageReceiverSuperclass-expected.cpp:

(Messages::WebPage::TestAsyncMessage::callReply):
(Messages::WebPage::TestAsyncMessage::cancelReply):
(Messages::WebPage::TestAsyncMessageWithMultipleArguments::callReply):
(Messages::WebPage::TestAsyncMessageWithMultipleArguments::cancelReply):

• Scripts/webkit/messages.py:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkit/MessageReceiverSuperclass-expected.cpp (modified) (5 diffs)
• Scripts/webkit/messages.py (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-24  Youenn Fablet  <youenn@apple.com>
+
+        Update messages_unittest.py after r245715
+        https://bugs.webkit.org/show_bug.cgi?id=198214
+
+        Reviewed by Alexey Proskuryakov.
+
+        Update expected results for messages.py output.i
+        Small refactoring to messages.py: instead of calling the completionHandler in case of decoding error with AsyncReply errors,
+        call cancelReply directly as it does the same thing.
+
+        * Scripts/webkit/MessageReceiverSuperclass-expected.cpp:
+        (Messages::WebPage::TestAsyncMessage::callReply):
+        (Messages::WebPage::TestAsyncMessage::cancelReply):
+        (Messages::WebPage::TestAsyncMessageWithMultipleArguments::callReply):
+        (Messages::WebPage::TestAsyncMessageWithMultipleArguments::cancelReply):
+        * Scripts/webkit/messages.py:
+
 2019-05-23  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebKit/Scripts/webkit/MessageReceiverSuperclass-expected.cpp

@@ -50 +50 @@
     if (!result) {
         ASSERT_NOT_REACHED();
+        cancelReply(WTFMove(completionHandler));
         return;
     }
@@ -57 +58 @@
 void TestAsyncMessage::cancelReply(CompletionHandler<void(uint64_t&&)>&& completionHandler)
 {
-    completionHandler({ });
+    completionHandler(IPC::AsyncReplyError<uint64_t>::create());
 }
 
@@ -95 +96 @@
     if (!flag) {
         ASSERT_NOT_REACHED();
+        cancelReply(WTFMove(completionHandler));
         return;
     }
@@ -101 +103 @@
     if (!value) {
         ASSERT_NOT_REACHED();
+        cancelReply(WTFMove(completionHandler));
         return;
     }
@@ -108 +111 @@
 void TestAsyncMessageWithMultipleArguments::cancelReply(CompletionHandler<void(bool&&, uint64_t&&)>&& completionHandler)
 {
-    completionHandler({ }, { });
+    completionHandler(IPC::AsyncReplyError<bool>::create(), IPC::AsyncReplyError<uint64_t>::create());
 }
 

trunk/Source/WebKit/Scripts/webkit/messages.py

@@ -595 +595 @@
                     result.append('    Optional<%s> %s;\n' % (x.type, x.name))
                     result.append('    decoder >> %s;\n' % x.name)
-                    result.append('    if (!%s) {\n        ASSERT_NOT_REACHED();\n        completionHandler(' % x.name)
-                    result.append(', '.join(['IPC::AsyncReplyError<' + x.type + '>::create()' for x in message.reply_parameters]))
-                    result.append(');\n        return;\n    }\n')
+                    result.append('    if (!%s) {\n        ASSERT_NOT_REACHED();\n        cancelReply(WTFMove(completionHandler));\n        return;\n    }\n' % x.name)
                 result.append('    completionHandler(')
                 if len(message.reply_parameters):