Attachment 421289 Details for Bug 222275 – Patch

[patch] Patch

bug-222275-20210223110332.patch (text/plain), 8.85 KB, created by Kimmo Kinnunen on 2021-02-23 01:03:33 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Kimmo Kinnunen

Created: 2021-02-23 01:03:33 PST

Size: 8.85 KB

patch

obsolete

>Subversion Revision: 273300
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 5ce3bb821757ed4584e49e001a128e2e80c3c715..7601b967b222e5cbcf1a1d9e8d62292706daf61c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,28 @@
>+2021-02-23  Kimmo Kinnunen  <kkinnunen@apple.com>
>+
>+        REGRESSION(r273204): webkitpy tests fail
>+        https://bugs.webkit.org/show_bug.cgi?id=222275
>+        <rdar://problem/74614397>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-22  Don Olmstead  <don.olmstead@sony.com>
> 
>         Non-unified build fixes late February 2021 edition
>diff --git a/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp b/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp
>index 9fc4c2e56c351e00482ee7442941d6bae1f99882..3e84ae1e39c7e7d7cdf895a42492771312aaa060 100644
>--- a/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp
>+++ b/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp
>@@ -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 @@ Optional<JSC::JSValue> jsValueForArguments(JSC::JSGlobalObject* globalObject, Me
>         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 @@ Optional<Vector<ArgumentDescription>> messageArgumentDescriptions(MessageName na
>         };
>     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;
>     }
>diff --git a/Source/WebKit/Scripts/webkit/tests/MessageNames.cpp b/Source/WebKit/Scripts/webkit/tests/MessageNames.cpp
>index 2e7ca15e74ebbda86c79f8fc0b8f38b4b5f75894..f76507cddf1703136b10a0f30684c3fcd144a613 100644
>--- a/Source/WebKit/Scripts/webkit/tests/MessageNames.cpp
>+++ b/Source/WebKit/Scripts/webkit/tests/MessageNames.cpp
>@@ -80,6 +80,12 @@ const char* description(MessageName name)
>         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 @@ ReceiverName receiverName(MessageName messageName)
>     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 @@ bool isValidMessageName(MessageName messageName)
>         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)
>diff --git a/Source/WebKit/Scripts/webkit/tests/MessageNames.h b/Source/WebKit/Scripts/webkit/tests/MessageNames.h
>index a22bd1cfd7f73be9eab1cbbc0ff0c6ef06a06408..fa9317887cf5931bd13bcb628dc80c30e498fe08 100644
>--- a/Source/WebKit/Scripts/webkit/tests/MessageNames.h
>+++ b/Source/WebKit/Scripts/webkit/tests/MessageNames.h
>@@ -33,11 +33,13 @@ enum class ReceiverName : uint8_t {
>     , 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 @@ enum class MessageName : uint16_t {
>     , TestWithLegacyReceiver_TouchEvent
>     , TestWithSemaphore_ReceiveSemaphore
>     , TestWithSemaphore_SendSemaphore
>+    , TestWithStreamBuffer_SendStreamBuffer
>+    , TestWithStream_SendString
>+    , TestWithStream_SendStringSynchronized
>     , TestWithSuperclass_LoadURL
>     , TestWithSuperclass_TestAsyncMessage
>     , TestWithSuperclass_TestAsyncMessageWithConnection
>diff --git a/Source/WebKit/Scripts/webkit/tests/TestWithSemaphoreMessages.h b/Source/WebKit/Scripts/webkit/tests/TestWithSemaphoreMessages.h
>index ed4e71e93eb5348e222f299e772d8201621196dd..32fad5b0aac4e5d5349134d625051a1b9a0557d1 100644
>--- a/Source/WebKit/Scripts/webkit/tests/TestWithSemaphoreMessages.h
>+++ b/Source/WebKit/Scripts/webkit/tests/TestWithSemaphoreMessages.h
>@@ -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 {
>diff --git a/Source/WebKit/Scripts/webkit/tests/TestWithStreamMessages.h b/Source/WebKit/Scripts/webkit/tests/TestWithStreamMessages.h
>index 90bfebab2372c1f6605c558945938bf1e4e7aafc..c42a4724c62c77d6fba99553dccedd09160228a2 100644
>--- a/Source/WebKit/Scripts/webkit/tests/TestWithStreamMessages.h
>+++ b/Source/WebKit/Scripts/webkit/tests/TestWithStreamMessages.h
>@@ -69,6 +69,7 @@ public:
>     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)

Actions: View | Formatted Diff | Diff

Attachments on bug 222275: 421289