- Revision
- 282236
- Author
- [email protected]
- Date
- 2021-09-09 12:59:07 -0700 (Thu, 09 Sep 2021)
Log Message
Enable IPCMessages debug logging for non-Cocoa ports
https://bugs.webkit.org/show_bug.cgi?id=230081
Reviewed by Alex Christensen.
r282177 temporarily disabled IPCMessages debug logging for
non-Cocoa ports because the generated
MessageArgumentDescriptions.cpp couldn't compile for them. Then,
r282190 fixed the problem. Enable it.
* Platform/IPC/HandleMessage.h:
(IPC::logMessageImpl): Reverted the change of r282177 to enable the logging.
(IPC::logReply): Ditto.
* Scripts/webkit/messages.py:
(generate_message_argument_description_implementation):
ENABLE(IPC_TESTING_API) isn't enabled for non-Cocoa ports yet.
Changed the condition.
* Scripts/webkit/tests/MessageArgumentDescriptions.cpp: Updated
this test expectation.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (282235 => 282236)
--- trunk/Source/WebKit/ChangeLog 2021-09-09 19:42:32 UTC (rev 282235)
+++ trunk/Source/WebKit/ChangeLog 2021-09-09 19:59:07 UTC (rev 282236)
@@ -1,3 +1,25 @@
+2021-09-09 Fujii Hironori <[email protected]>
+
+ Enable IPCMessages debug logging for non-Cocoa ports
+ https://bugs.webkit.org/show_bug.cgi?id=230081
+
+ Reviewed by Alex Christensen.
+
+ r282177 temporarily disabled IPCMessages debug logging for
+ non-Cocoa ports because the generated
+ MessageArgumentDescriptions.cpp couldn't compile for them. Then,
+ r282190 fixed the problem. Enable it.
+
+ * Platform/IPC/HandleMessage.h:
+ (IPC::logMessageImpl): Reverted the change of r282177 to enable the logging.
+ (IPC::logReply): Ditto.
+ * Scripts/webkit/messages.py:
+ (generate_message_argument_description_implementation):
+ ENABLE(IPC_TESTING_API) isn't enabled for non-Cocoa ports yet.
+ Changed the condition.
+ * Scripts/webkit/tests/MessageArgumentDescriptions.cpp: Updated
+ this test expectation.
+
2021-09-09 Alex Christensen <[email protected]>
Add PrivateClickMeasurement daemon
Modified: trunk/Source/WebKit/Platform/IPC/HandleMessage.h (282235 => 282236)
--- trunk/Source/WebKit/Platform/IPC/HandleMessage.h 2021-09-09 19:42:32 UTC (rev 282235)
+++ trunk/Source/WebKit/Platform/IPC/HandleMessage.h 2021-09-09 19:59:07 UTC (rev 282236)
@@ -47,7 +47,7 @@
constexpr unsigned loggingContainerSizeLimit = 200;
-#if !LOG_DISABLED && ENABLE(IPC_TESTING_API)
+#if !LOG_DISABLED
enum class ForReply : bool { No, Yes };
inline TextStream textStreamForLogging(const Connection& connection, MessageName messageName, ForReply forReply)
@@ -73,7 +73,7 @@
template<typename ArgsTuple, size_t... ArgsIndex>
void logMessageImpl(const Connection& connection, MessageName messageName, const ArgsTuple& args, std::index_sequence<ArgsIndex...>)
{
-#if !LOG_DISABLED && ENABLE(IPC_TESTING_API)
+#if !LOG_DISABLED
auto stream = textStreamForLogging(connection, messageName, ForReply::No);
if (auto argumentDescriptions = messageArgumentDescriptions(messageName))
@@ -96,7 +96,7 @@
template<typename... T>
void logReply(const Connection& connection, MessageName messageName, const T&... args)
{
-#if !LOG_DISABLED && ENABLE(IPC_TESTING_API)
+#if !LOG_DISABLED
if (!sizeof...(T))
return;
Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (282235 => 282236)
--- trunk/Source/WebKit/Scripts/webkit/messages.py 2021-09-09 19:42:32 UTC (rev 282235)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py 2021-09-09 19:59:07 UTC (rev 282236)
@@ -1236,7 +1236,7 @@
result.append('#include "config.h"\n')
result.append('#include "MessageArgumentDescriptions.h"\n')
result.append('\n')
- result.append('#if ENABLE(IPC_TESTING_API)\n')
+ result.append('#if ENABLE(IPC_TESTING_API) || !LOG_DISABLED\n')
result.append('\n')
result.append('#include "JSIPCBinding.h"\n')
@@ -1257,6 +1257,8 @@
result.append('namespace IPC {\n')
result.append('\n')
+ result.append('#if ENABLE(IPC_TESTING_API)\n')
+ result.append('\n')
generate_js_value_conversion_function(result, receivers, 'jsValueForArguments', 'Arguments')
@@ -1265,6 +1267,8 @@
generate_js_value_conversion_function(result, receivers, 'jsValueForReplyArguments', 'ReplyArguments', lambda message: message.reply_parameters is not None and (message.has_attribute(SYNCHRONOUS_ATTRIBUTE) or message.has_attribute(ASYNC_ATTRIBUTE)))
result.append('\n')
+ result.append('#endif // ENABLE(IPC_TESTING_API)\n')
+ result.append('\n')
result += generate_js_argument_descriptions(receivers, 'messageArgumentDescriptions', lambda message: message.parameters)
@@ -1276,5 +1280,5 @@
result.append('} // namespace WebKit\n')
result.append('\n')
- result.append('#endif\n')
+ result.append('#endif // ENABLE(IPC_TESTING_API) || !LOG_DISABLED\n')
return ''.join(result)
Modified: trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp (282235 => 282236)
--- trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp 2021-09-09 19:42:32 UTC (rev 282235)
+++ trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp 2021-09-09 19:59:07 UTC (rev 282236)
@@ -25,7 +25,7 @@
#include "config.h"
#include "MessageArgumentDescriptions.h"
-#if ENABLE(IPC_TESTING_API)
+#if ENABLE(IPC_TESTING_API) || !LOG_DISABLED
#include "JSIPCBinding.h"
#include "ArgumentCoders.h"
@@ -132,6 +132,8 @@
namespace IPC {
+#if ENABLE(IPC_TESTING_API)
+
std::optional<JSC::JSValue> jsValueForArguments(JSC::JSGlobalObject* globalObject, MessageName name, Decoder& decoder)
{
switch (name) {
@@ -348,6 +350,8 @@
return std::nullopt;
}
+#endif // ENABLE(IPC_TESTING_API)
+
std::optional<Vector<ArgumentDescription>> messageArgumentDescriptions(MessageName name)
{
switch (name) {
@@ -710,4 +714,4 @@
} // namespace WebKit
-#endif
+#endif // ENABLE(IPC_TESTING_API) || !LOG_DISABLED
