Title: [245749] trunk/Source/WebKit
- Revision
- 245749
- Author
- [email protected]
- Date
- 2019-05-24 11:55:28 -0700 (Fri, 24 May 2019)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (245748 => 245749)
--- trunk/Source/WebKit/ChangeLog 2019-05-24 18:26:45 UTC (rev 245748)
+++ trunk/Source/WebKit/ChangeLog 2019-05-24 18:55:28 UTC (rev 245749)
@@ -1,3 +1,21 @@
+2019-05-24 Youenn Fablet <[email protected]>
+
+ 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 <[email protected]>
Socket-based RWI should be able to inspect a JSContext
Modified: trunk/Source/WebKit/Scripts/webkit/MessageReceiverSuperclass-expected.cpp (245748 => 245749)
--- trunk/Source/WebKit/Scripts/webkit/MessageReceiverSuperclass-expected.cpp 2019-05-24 18:26:45 UTC (rev 245748)
+++ trunk/Source/WebKit/Scripts/webkit/MessageReceiverSuperclass-expected.cpp 2019-05-24 18:55:28 UTC (rev 245749)
@@ -49,6 +49,7 @@
decoder >> result;
if (!result) {
ASSERT_NOT_REACHED();
+ cancelReply(WTFMove(completionHandler));
return;
}
completionHandler(WTFMove(*result));
@@ -56,7 +57,7 @@
void TestAsyncMessage::cancelReply(CompletionHandler<void(uint64_t&&)>&& completionHandler)
{
- completionHandler({ });
+ completionHandler(IPC::AsyncReplyError<uint64_t>::create());
}
void TestAsyncMessage::send(std::unique_ptr<IPC::Encoder>&& encoder, IPC::Connection& connection, uint64_t result)
@@ -94,6 +95,7 @@
decoder >> flag;
if (!flag) {
ASSERT_NOT_REACHED();
+ cancelReply(WTFMove(completionHandler));
return;
}
Optional<uint64_t> value;
@@ -100,6 +102,7 @@
decoder >> value;
if (!value) {
ASSERT_NOT_REACHED();
+ cancelReply(WTFMove(completionHandler));
return;
}
completionHandler(WTFMove(*flag), WTFMove(*value));
@@ -107,7 +110,7 @@
void TestAsyncMessageWithMultipleArguments::cancelReply(CompletionHandler<void(bool&&, uint64_t&&)>&& completionHandler)
{
- completionHandler({ }, { });
+ completionHandler(IPC::AsyncReplyError<bool>::create(), IPC::AsyncReplyError<uint64_t>::create());
}
void TestAsyncMessageWithMultipleArguments::send(std::unique_ptr<IPC::Encoder>&& encoder, IPC::Connection& connection, bool flag, uint64_t value)
Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (245748 => 245749)
--- trunk/Source/WebKit/Scripts/webkit/messages.py 2019-05-24 18:26:45 UTC (rev 245748)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py 2019-05-24 18:55:28 UTC (rev 245749)
@@ -594,9 +594,7 @@
for x in message.reply_parameters:
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):
result.append('WTFMove(*%s)' % ('), WTFMove(*'.join(x.name for x in message.reply_parameters)))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
