Diff
Modified: trunk/Source/WebKit/ChangeLog (273312 => 273313)
--- trunk/Source/WebKit/ChangeLog 2021-02-23 17:23:32 UTC (rev 273312)
+++ trunk/Source/WebKit/ChangeLog 2021-02-23 17:37:54 UTC (rev 273313)
@@ -1,3 +1,28 @@
+2021-02-23 Kimmo Kinnunen <[email protected]>
+
+ REGRESSION(r273204): webkitpy tests fail
+ https://bugs.webkit.org/show_bug.cgi?id=222275
+ <rdar://problem/74614397>
+
+ Reviewed by Jonathan Bedard.
+
+ Regenerate the IPC generation test expectations that were
+ not part of r273204.
+
+ Tested by
+ ./Tools/Scripts/test-webkitpy-python2 -j1 -p Source/WebKit/Scripts/webkit/messages_unittest.py
+
+ * Scripts/webkit/tests/MessageArgumentDescriptions.cpp:
+ (IPC::jsValueForArguments):
+ (IPC::messageArgumentDescriptions):
+ * Scripts/webkit/tests/MessageNames.cpp:
+ (IPC::description):
+ (IPC::receiverName):
+ (IPC::isValidMessageName):
+ * Scripts/webkit/tests/MessageNames.h:
+ * Scripts/webkit/tests/TestWithSemaphoreMessages.h:
+ * Scripts/webkit/tests/TestWithStreamMessages.h:
+
2021-02-23 Wenson Hsieh <[email protected]>
[iOS] Add a watchdog timer to forcibly reset deferring gesture recognizers
Modified: trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp (273312 => 273313)
--- trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp 2021-02-23 17:23:32 UTC (rev 273312)
+++ trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp 2021-02-23 17:37:54 UTC (rev 273313)
@@ -41,6 +41,7 @@
#include "MachPort.h"
#endif
#include "Plugin.h"
+#include "StreamConnectionBuffer.h"
#include "TestClassName.h"
#if ENABLE(TEST_FEATURE)
#include "TestTwoStateEnum.h"
@@ -49,6 +50,8 @@
#include "TestWithImageDataMessages.h"
#include "TestWithLegacyReceiverMessages.h"
#include "TestWithSemaphoreMessages.h"
+#include "TestWithStreamBufferMessages.h"
+#include "TestWithStreamMessages.h"
#include "TestWithSuperclassMessages.h"
#include "TestWithoutAttributesMessages.h"
#include "WebCoreArgumentCoders.h"
@@ -229,6 +232,12 @@
return jsValueForDecodedArguments<Messages::TestWithImageData::SendImageData::Arguments>(globalObject, decoder);
case MessageName::TestWithImageData_ReceiveImageData:
return jsValueForDecodedArguments<Messages::TestWithImageData::ReceiveImageData::Arguments>(globalObject, decoder);
+ case MessageName::TestWithStream_SendString:
+ return jsValueForDecodedArguments<Messages::TestWithStream::SendString::Arguments>(globalObject, decoder);
+ case MessageName::TestWithStream_SendStringSynchronized:
+ return jsValueForDecodedArguments<Messages::TestWithStream::SendStringSynchronized::Arguments>(globalObject, decoder);
+ case MessageName::TestWithStreamBuffer_SendStreamBuffer:
+ return jsValueForDecodedArguments<Messages::TestWithStreamBuffer::SendStreamBuffer::Arguments>(globalObject, decoder);
default:
break;
}
@@ -542,6 +551,18 @@
};
case MessageName::TestWithImageData_ReceiveImageData:
return Vector<ArgumentDescription> { };
+ case MessageName::TestWithStream_SendString:
+ return Vector<ArgumentDescription> {
+ {"url", "String", nullptr, false},
+ };
+ case MessageName::TestWithStream_SendStringSynchronized:
+ return Vector<ArgumentDescription> {
+ {"url", "String", nullptr, false},
+ };
+ case MessageName::TestWithStreamBuffer_SendStreamBuffer:
+ return Vector<ArgumentDescription> {
+ {"stream", "IPC::StreamConnectionBuffer", nullptr, false},
+ };
default:
break;
}
Modified: trunk/Source/WebKit/Scripts/webkit/tests/MessageNames.cpp (273312 => 273313)
--- trunk/Source/WebKit/Scripts/webkit/tests/MessageNames.cpp 2021-02-23 17:23:32 UTC (rev 273312)
+++ trunk/Source/WebKit/Scripts/webkit/tests/MessageNames.cpp 2021-02-23 17:37:54 UTC (rev 273313)
@@ -80,6 +80,12 @@
return "TestWithSemaphore_ReceiveSemaphore";
case MessageName::TestWithSemaphore_SendSemaphore:
return "TestWithSemaphore_SendSemaphore";
+ case MessageName::TestWithStreamBuffer_SendStreamBuffer:
+ return "TestWithStreamBuffer_SendStreamBuffer";
+ case MessageName::TestWithStream_SendString:
+ return "TestWithStream_SendString";
+ case MessageName::TestWithStream_SendStringSynchronized:
+ return "TestWithStream_SendStringSynchronized";
case MessageName::TestWithSuperclass_LoadURL:
return "TestWithSuperclass_LoadURL";
case MessageName::TestWithSuperclass_TestAsyncMessage:
@@ -199,6 +205,11 @@
case MessageName::TestWithSemaphore_ReceiveSemaphore:
case MessageName::TestWithSemaphore_SendSemaphore:
return ReceiverName::TestWithSemaphore;
+ case MessageName::TestWithStreamBuffer_SendStreamBuffer:
+ return ReceiverName::TestWithStreamBuffer;
+ case MessageName::TestWithStream_SendString:
+ case MessageName::TestWithStream_SendStringSynchronized:
+ return ReceiverName::TestWithStream;
case MessageName::TestWithSuperclass_LoadURL:
case MessageName::TestWithSuperclass_TestAsyncMessage:
case MessageName::TestWithSuperclass_TestAsyncMessageWithConnection:
@@ -327,6 +338,12 @@
return true;
if (messageName == IPC::MessageName::TestWithSemaphore_SendSemaphore)
return true;
+ if (messageName == IPC::MessageName::TestWithStreamBuffer_SendStreamBuffer)
+ return true;
+ if (messageName == IPC::MessageName::TestWithStream_SendString)
+ return true;
+ if (messageName == IPC::MessageName::TestWithStream_SendStringSynchronized)
+ return true;
if (messageName == IPC::MessageName::TestWithSuperclass_LoadURL)
return true;
#if ENABLE(TEST_FEATURE)
Modified: trunk/Source/WebKit/Scripts/webkit/tests/MessageNames.h (273312 => 273313)
--- trunk/Source/WebKit/Scripts/webkit/tests/MessageNames.h 2021-02-23 17:23:32 UTC (rev 273312)
+++ trunk/Source/WebKit/Scripts/webkit/tests/MessageNames.h 2021-02-23 17:37:54 UTC (rev 273313)
@@ -33,11 +33,13 @@
, TestWithImageData = 2
, TestWithLegacyReceiver = 3
, TestWithSemaphore = 4
- , TestWithSuperclass = 5
- , TestWithoutAttributes = 6
- , IPC = 7
- , AsyncReply = 8
- , Invalid = 9
+ , TestWithStream = 5
+ , TestWithStreamBuffer = 6
+ , TestWithSuperclass = 7
+ , TestWithoutAttributes = 8
+ , IPC = 9
+ , AsyncReply = 10
+ , Invalid = 11
};
enum class MessageName : uint16_t {
@@ -66,6 +68,9 @@
, TestWithLegacyReceiver_TouchEvent
, TestWithSemaphore_ReceiveSemaphore
, TestWithSemaphore_SendSemaphore
+ , TestWithStreamBuffer_SendStreamBuffer
+ , TestWithStream_SendString
+ , TestWithStream_SendStringSynchronized
, TestWithSuperclass_LoadURL
, TestWithSuperclass_TestAsyncMessage
, TestWithSuperclass_TestAsyncMessageWithConnection
Modified: trunk/Source/WebKit/Scripts/webkit/tests/TestWithSemaphoreMessages.h (273312 => 273313)
--- trunk/Source/WebKit/Scripts/webkit/tests/TestWithSemaphoreMessages.h 2021-02-23 17:23:32 UTC (rev 273312)
+++ trunk/Source/WebKit/Scripts/webkit/tests/TestWithSemaphoreMessages.h 2021-02-23 17:37:54 UTC (rev 273313)
@@ -26,14 +26,12 @@
#include "ArgumentCoders.h"
#include "Connection.h"
+#include "IPCSemaphore.h"
#include "MessageNames.h"
#include "TestWithSemaphoreMessagesReplies.h"
#include <wtf/Forward.h>
#include <wtf/ThreadSafeRefCounted.h>
-namespace IPC {
-class Semaphore;
-}
namespace Messages {
namespace TestWithSemaphore {
Modified: trunk/Source/WebKit/Scripts/webkit/tests/TestWithStreamMessages.h (273312 => 273313)
--- trunk/Source/WebKit/Scripts/webkit/tests/TestWithStreamMessages.h 2021-02-23 17:23:32 UTC (rev 273312)
+++ trunk/Source/WebKit/Scripts/webkit/tests/TestWithStreamMessages.h 2021-02-23 17:37:54 UTC (rev 273313)
@@ -69,6 +69,7 @@
static IPC::MessageName name() { return IPC::MessageName::TestWithStream_SendStringSynchronized; }
static const bool isSync = true;
+ static constexpr auto callbackThread = WTF::CompletionHandlerCallThread::ConstructionThread;
using Reply = std::tuple<int64_t&>;
using ReplyArguments = std::tuple<int64_t>;
explicit SendStringSynchronized(const String& url)
