Title: [281732] trunk/Source/WebKit
- Revision
- 281732
- Author
- [email protected]
- Date
- 2021-08-27 23:04:34 -0700 (Fri, 27 Aug 2021)
Log Message
Fix std::optional<> stripping in MessageArgumentDescriptions.cpp generator
https://bugs.webkit.org/show_bug.cgi?id=229636
<rdar://problem/82461615>
Reviewed by Darin Adler.
* Scripts/webkit/messages.py:
(generate_js_argument_descriptions):
* Scripts/webkit/tests/MessageArgumentDescriptions.cpp:
(IPC::messageReplyArgumentDescriptions):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (281731 => 281732)
--- trunk/Source/WebKit/ChangeLog 2021-08-28 03:20:21 UTC (rev 281731)
+++ trunk/Source/WebKit/ChangeLog 2021-08-28 06:04:34 UTC (rev 281732)
@@ -1,3 +1,16 @@
+2021-08-27 Cameron McCormack <[email protected]>
+
+ Fix std::optional<> stripping in MessageArgumentDescriptions.cpp generator
+ https://bugs.webkit.org/show_bug.cgi?id=229636
+ <rdar://problem/82461615>
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkit/messages.py:
+ (generate_js_argument_descriptions):
+ * Scripts/webkit/tests/MessageArgumentDescriptions.cpp:
+ (IPC::messageReplyArgumentDescriptions):
+
2021-08-27 Simon Fraser <[email protected]>
Address post-landing feedback on r281728.
Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (281731 => 281732)
--- trunk/Source/WebKit/Scripts/webkit/messages.py 2021-08-28 03:20:21 UTC (rev 281731)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py 2021-08-28 06:04:34 UTC (rev 281732)
@@ -1212,7 +1212,7 @@
enum_type = '"%s"' % argument_type
argument_type = argument.kind[5:]
if argument_type.startswith('std::optional<') and argument_type.endswith('>'):
- argument_type = argument_type[9:-1]
+ argument_type = argument_type[14:-1]
is_optional = True
result.append(' {"%s", "%s", %s, %s},\n' % (argument.name, argument_type, enum_type or 'nullptr', 'true' if is_optional else 'false'))
result.append(' };\n')
Modified: trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp (281731 => 281732)
--- trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp 2021-08-28 03:20:21 UTC (rev 281731)
+++ trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp 2021-08-28 06:04:34 UTC (rev 281732)
@@ -639,7 +639,7 @@
};
case MessageName::TestWithSuperclass_TestSynchronousMessage:
return Vector<ArgumentDescription> {
- {"optionalReply", "onal<WebKit::TestClassName", nullptr, true},
+ {"optionalReply", "WebKit::TestClassName", nullptr, true},
};
#if (ENABLE(WEBKIT2) && (NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND))
case MessageName::TestWithLegacyReceiver_GetPluginProcessConnection:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
