Changeset 268486 in webkit

Timestamp:

Oct 14, 2020 1:52:37 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r268431 and r268443.
​https://bugs.webkit.org/show_bug.cgi?id=217728

Broke debug builds of GTK, WinCairo and Playstation ports

Reverted changesets:

"IPC testing JS API should expose a reply and describe the
list of arguments for each message"
​https://bugs.webkit.org/show_bug.cgi?id=217565
​https://trac.webkit.org/changeset/268431

"IPC testing JS API should expose a reply and describe the
list of arguments for each message"
​https://bugs.webkit.org/show_bug.cgi?id=217565
​https://trac.webkit.org/changeset/268443

Location:

trunk

Files:

• Source/WebKit/CMakeLists.txt (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/DerivedSources-output.xcfilelist (modified) (1 diff)
• Source/WebKit/DerivedSources.make (modified) (1 diff)
• Source/WebKit/Platform/IPC/Decoder.h (modified) (1 diff)
• Source/WebKit/Platform/IPC/JSIPCBinding.h (deleted)
• Source/WebKit/Platform/IPC/MessageArgumentDescriptions.h (deleted)
• Source/WebKit/Scripts/generate-message-receiver.py (modified) (3 diffs)
• Source/WebKit/Scripts/webkit/messages.py (modified) (6 diffs)
• Source/WebKit/Shared/ApplePay/ApplePayPaymentSetupFeaturesWebKit.h (modified) (1 diff)
• Source/WebKit/SourcesCocoa.txt (modified) (1 diff)
• Source/WebKit/UIProcess/WebProcessProxy.cpp (modified) (1 diff)
• Source/WebKit/WebKit.xcodeproj/project.pbxproj (modified) (7 diffs)
• Source/WebKit/WebProcess/WebPage/IPCTestingAPI.cpp (modified) (19 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/IPCTestingAPI.mm (modified) (4 diffs)

trunk/Source/WebKit/CMakeLists.txt

@@ -429 +429 @@
     add_custom_command(
         OUTPUT
-            ${WebKit_DERIVED_SOURCES_DIR}/MessageArgumentDescriptions.cpp
             ${WebKit_DERIVED_SOURCES_DIR}/MessageNames.cpp
             ${WebKit_DERIVED_SOURCES_DIR}/MessageNames.h

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-14  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r268431 and r268443.
+        https://bugs.webkit.org/show_bug.cgi?id=217728
+
+        Broke debug builds of GTK, WinCairo and Playstation ports
+
+        Reverted changesets:
+
+        "IPC testing JS API should expose a reply and describe the
+        list of arguments for each message"
+        https://bugs.webkit.org/show_bug.cgi?id=217565
+        https://trac.webkit.org/changeset/268431
+
+        "IPC testing JS API should expose a reply and describe the
+        list of arguments for each message"
+        https://bugs.webkit.org/show_bug.cgi?id=217565
+        https://trac.webkit.org/changeset/268443
+
 2020-10-14  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebKit/DerivedSources-output.xcfilelist

@@ -69 +69 @@
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/MediaPlayerPrivateRemoteMessages.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/MediaPlayerPrivateRemoteMessagesReplies.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/MessageArgumentDescriptions.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/MessageNames.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/MessageNames.h

trunk/Source/WebKit/DerivedSources.make

@@ -258 +258 @@
 MESSAGE_REPLIES_FILES := $(addsuffix MessagesReplies.h,$(notdir $(MESSAGE_RECEIVERS)))
 
-GENERATED_MESSAGES_FILES := $(MESSAGE_RECEIVER_FILES) $(MESSAGES_FILES) $(MESSAGE_REPLIES_FILES) MessageNames.h MessageNames.cpp MessageArgumentDescriptions.cpp
+GENERATED_MESSAGES_FILES := $(MESSAGE_RECEIVER_FILES) $(MESSAGES_FILES) $(MESSAGE_REPLIES_FILES) MessageNames.h MessageNames.cpp
 GENERATED_MESSAGES_FILES_AS_PATTERNS := $(subst .,%,$(GENERATED_MESSAGES_FILES))
 

trunk/Source/WebKit/Platform/IPC/Decoder.h

@@ -73 +73 @@
     static std::unique_ptr<Decoder> unwrapForTesting(Decoder&);
 
-    const uint8_t* buffer() const { return m_buffer; }
     size_t length() const { return m_bufferEnd - m_buffer; }
 

trunk/Source/WebKit/Scripts/generate-message-receiver.py

@@ -35 +35 @@
     first_arg = True
     second_arg = False
-    receiver_header_files = []
     for parameter in argv:
         if first_arg:
@@ -55 +54 @@
             implementation_output.write(webkit.messages.generate_message_handler(receiver))
 
-        receiver_message_header = '%sMessages.h' % receiver_name
-        receiver_header_files.append(receiver_message_header)
-        with open(receiver_message_header, "w+") as header_output:
+        with open('%sMessages.h' % receiver_name, "w+") as header_output:
             header_output.write(webkit.messages.generate_messages_header(receiver))
 
@@ -69 +66 @@
         message_names_implementation_output.write(webkit.messages.generate_message_names_implementation(receivers))
 
-    with open('MessageArgumentDescriptions.cpp', "w+") as message_descriptions_implementation_output:
-        message_descriptions_implementation_output.write(webkit.messages.generate_message_argument_description_implementation(receivers, receiver_header_files))
-
     return 0
 

trunk/Source/WebKit/Scripts/webkit/messages.py

@@ -624 +624 @@
         'WebCore::PasteboardWebContent': ['<WebCore/Pasteboard.h>'],
         'WebCore::PaymentAuthorizationResult': ['<WebCore/ApplePaySessionPaymentRequest.h>'],
+        'WebCore::PaymentMethodUpdate': ['<WebCore/ApplePaySessionPaymentRequest.h>'],
         'WebCore::PlatformTextTrackData': ['<WebCore/PlatformTextTrack.h>'],
         'WebCore::PluginInfo': ['<WebCore/PluginData.h>'],
@@ -687 +688 @@
         'struct WebKit::WebUserStyleSheetData': ['"WebUserContentControllerDataTypes.h"'],
         'struct WebKit::WebScriptMessageHandlerData': ['"WebUserContentControllerDataTypes.h"'],
-        'webrtc::WebKitEncodedFrameInfo': ['<webrtc/sdk/WebKit/WebKitEncoder.h>', '<WebCore/LibWebRTCEnumTraits.h>'],
+        'webrtc::WebKitEncodedFrameInfo': ['<webrtc/sdk/WebKit/WebKitEncoder.h>'],
         'webrtc::WebKitRTPFragmentationHeader': ['<webrtc/sdk/WebKit/WebKitEncoder.h>'],
     }
@@ -714 +715 @@
 
 
-def collect_header_conditions_for_receiver(receiver, header_conditions):
+def generate_message_handler(receiver):
+    header_conditions = {
+        '"%s"' % messages_header_filename(receiver): [None],
+        '"HandleMessage.h"': [None],
+        '"Decoder.h"': [None],
+    }
+
     type_conditions = {}
     for parameter in receiver.iterparameters():
@@ -757 +764 @@
                     header_conditions[header].append(message.condition)
 
-    return header_conditions
-
-
-def generate_header_includes_from_conditions(header_conditions):
     result = []
+
+    result.append(_license_header)
+    result.append('#include "config.h"\n')
+    result.append('\n')
+
+    if receiver.condition:
+        result.append('#if %s\n\n' % receiver.condition)
+
+    result.append('#include "%s.h"\n\n' % receiver.name)
     for header in sorted(header_conditions):
         if header_conditions[header] and not None in header_conditions[header]:
@@ -769 +781 @@
         else:
             result += ['#include %s\n' % header]
-    return result
-
-
-def generate_message_handler(receiver):
-    header_conditions = {
-        '"%s"' % messages_header_filename(receiver): [None],
-        '"HandleMessage.h"': [None],
-        '"Decoder.h"': [None],
-    }
-
-    collect_header_conditions_for_receiver(receiver, header_conditions)
-
-    result = []
-
-    result.append(_license_header)
-    result.append('#include "config.h"\n')
-    result.append('\n')
-
-    if receiver.condition:
-        result.append('#if %s\n\n' % receiver.condition)
-
-    result.append('#include "%s.h"\n\n' % receiver.name)
-    result += generate_header_includes_from_conditions(header_conditions)
     result.append('\n')
 
@@ -1056 +1045 @@
     result.append('} // namespace IPC\n')
     return ''.join(result)
-
-
-def generate_js_value_conversion_function(result, receivers, function_name, argument_type, predicate=lambda message: True):
-    result.append('Optional<JSC::JSValue> %s(JSC::JSGlobalObject* globalObject, MessageName name, Decoder& decoder)\n' % function_name)
-    result.append('{\n')
-    result.append('    switch (name) {\n')
-    for receiver in receivers:
-        if receiver.condition:
-            result.append('#if %s\n' % receiver.condition)
-        prevision_message_condition = None
-        for message in receiver.messages:
-            if not predicate(message):
-                continue
-            if prevision_message_condition != message.condition:
-                if prevision_message_condition:
-                    result.append('#endif\n')
-                if message.condition:
-                    result.append('#if %s\n' % message.condition)
-            prevision_message_condition = message.condition
-            result.append('    case MessageName::%s_%s:\n' % (receiver.name, message.name))
-            result.append('        return jsValueForDecodedArguments<Messages::%s::%s::%s>(globalObject, decoder);\n' % (receiver.name, message.name, argument_type))
-        if prevision_message_condition:
-            result.append('#endif\n')
-        if receiver.condition:
-            result.append('#endif\n')
-    result.append('    default:\n')
-    result.append('        break;\n')
-    result.append('    }\n')
-    result.append('    return WTF::nullopt;\n')
-    result.append('}\n')
-
-
-def generate_js_argument_descriptions(receivers, function_name, arguments_from_message):
-    result = []
-    result.append('Optional<Vector<ArgumentDescription>> %s(MessageName name)\n' % function_name)
-    result.append('{\n')
-    result.append('    switch (name) {\n')
-    for receiver in receivers:
-        if receiver.condition:
-            result.append('#if %s\n' % receiver.condition)
-        prevision_message_condition = None
-        for message in receiver.messages:
-            argument_list = arguments_from_message(message)
-            if argument_list is None:
-                continue
-            if prevision_message_condition != message.condition:
-                if prevision_message_condition:
-                    result.append('#endif\n')
-                if message.condition:
-                    result.append('#if %s\n' % message.condition)
-            prevision_message_condition = message.condition
-            result.append('    case MessageName::%s_%s:\n' % (receiver.name, message.name))
-
-            if not len(argument_list):
-                result.append('        return Vector<ArgumentDescription> { };\n')
-                continue
-
-            result.append('        return Vector<ArgumentDescription> {\n')
-            for argument in argument_list:
-                argument_type = argument.type
-                enum_type = None
-                is_optional = False
-                if argument.kind.startswith('enum:'):
-                    enum_type = '"%s"' % argument_type
-                    argument_type = argument.kind[5:]
-                if argument_type.startswith('Optional<') and argument_type.endswith('>'):
-                    argument_type = argument_type[9:-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')
-        if prevision_message_condition:
-            result.append('#endif\n')
-        if receiver.condition:
-            result.append('#endif\n')
-    result.append('    default:\n')
-    result.append('        break;\n')
-    result.append('    }\n')
-    result.append('    return WTF::nullopt;\n')
-    result.append('}\n')
-    return result
-
-
-def generate_message_argument_description_implementation(receivers, receiver_headers):
-    header_conditions = {
-        '"JSIPCBinding.h"': [None]
-    }
-    for receiver in receivers:
-        header_conditions['"%s"' % messages_header_filename(receiver)] = [None]
-        collect_header_conditions_for_receiver(receiver, header_conditions)
-
-    result = []
-    result.append(_license_header)
-    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('\n')
-    result += generate_header_includes_from_conditions(header_conditions)
-    result.append('\n')
-
-    for header in receiver_headers:
-        result.append('#include "%s"\n' % (header))
-
-    result.append('\n')
-    result.append('namespace IPC {\n')
-    result.append('\n')
-
-    generate_js_value_conversion_function(result, receivers, 'jsValueForArguments', 'Arguments')
-
-    result.append('\n')
-
-    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 += generate_js_argument_descriptions(receivers, 'messageArgumentDescriptions', lambda message: message.parameters)
-
-    result.append('\n')
-
-    result += generate_js_argument_descriptions(receivers, 'messageReplyArgumentDescriptions', lambda message: message.reply_parameters if message.has_attribute(SYNCHRONOUS_ATTRIBUTE) or message.has_attribute(ASYNC_ATTRIBUTE) else None)
-
-    result.append('\n')
-
-    result.append('} // namespace WebKit\n')
-    result.append('\n')
-    result.append('#endif\n')
-    return ''.join(result)

trunk/Source/WebKit/Shared/ApplePay/ApplePayPaymentSetupFeaturesWebKit.h

@@ -28 +28 @@
 #if ENABLE(APPLE_PAY)
 
-OBJC_CLASS NSArray;
 OBJC_CLASS PKPaymentSetupFeature;
 

trunk/Source/WebKit/SourcesCocoa.txt

@@ -659 +659 @@
 LibWebRTCCodecsProxyMessageReceiver.cpp
 LibWebRTCCodecsMessageReceiver.cpp
-MessageArgumentDescriptions.cpp @no-unify
 MessageNames.cpp
 RemoteAudioDestinationManagerMessageReceiver.cpp

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -881 +881 @@
     WebProcessPool::didReceiveInvalidMessage(messageName);
 
-#if ENABLE(IPC_TESTING_API)
-    if (processPool().defaultPageGroup().preferences().store().getBoolValueForKey(WebPreferencesKey::ipcTestingAPIEnabledKey()))
-        return;
-#endif
-
     // Terminate the WebContent process.
     terminate();

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1424 +1424 @@
                 9B1229CE23FF25F2008CA751 /* RemoteAudioDestinationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B1229CC23FF25F2008CA751 /* RemoteAudioDestinationManager.cpp */; };
                 9B1229D223FF2BCC008CA751 /* RemoteAudioDestinationIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B1229D023FF2A5E008CA751 /* RemoteAudioDestinationIdentifier.h */; };
-                9B47908D25314D8300EC11AB /* MessageArgumentDescriptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B47908C25314D8300EC11AB /* MessageArgumentDescriptions.h */; };
-                9B47908F253151CC00EC11AB /* JSIPCBinding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B47908E253151CC00EC11AB /* JSIPCBinding.h */; };
-                9B4790912531563200EC11AB /* MessageArgumentDescriptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B4790902531563200EC11AB /* MessageArgumentDescriptions.cpp */; };
                 9B5499AD2362A6F900DF8BA5 /* _WKTextManipulationConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B5499AC2362A6F600DF8BA5 /* _WKTextManipulationConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9B5499B22362A7EC00DF8BA5 /* _WKTextManipulationExclusionRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B5499B02362A7EC00DF8BA5 /* _WKTextManipulationExclusionRule.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -4529 +4526 @@
                 9B1229CF23FF2814008CA751 /* RemoteAudioDestinationManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteAudioDestinationManager.messages.in; sourceTree = "<group>"; };
                 9B1229D023FF2A5E008CA751 /* RemoteAudioDestinationIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioDestinationIdentifier.h; sourceTree = "<group>"; };
-                9B47908C25314D8300EC11AB /* MessageArgumentDescriptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageArgumentDescriptions.h; sourceTree = "<group>"; };
-                9B47908E253151CC00EC11AB /* JSIPCBinding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSIPCBinding.h; sourceTree = "<group>"; };
-                9B4790902531563200EC11AB /* MessageArgumentDescriptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MessageArgumentDescriptions.cpp; path = MessageArgumentDescriptions.cpp; sourceTree = "<group>"; };
                 9B5499AC2362A6F600DF8BA5 /* _WKTextManipulationConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _WKTextManipulationConfiguration.h; sourceTree = "<group>"; };
                 9B5499AE2362A7A700DF8BA5 /* _WKTextManipulationConfiguration.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKTextManipulationConfiguration.mm; sourceTree = "<group>"; };
@@ -6465 +6459 @@
                                 C0CE72AC1247E78D00BC0EC4 /* HandleMessage.h */,
                                 1C9AF36124134D2300D3EC02 /* ImageDataReference.h */,
-                                9B47908E253151CC00EC11AB /* JSIPCBinding.h */,
-                                9B47908C25314D8300EC11AB /* MessageArgumentDescriptions.h */,
                                 1AC4C82816B876A90069DCCD /* MessageFlags.h */,
                                 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */,
@@ -10090 +10082 @@
                                 07E19EF923D401F00094FFB4 /* MediaPlayerPrivateRemoteMessages.h */,
                                 07E19EFA23D401F00094FFB4 /* MediaPlayerPrivateRemoteMessagesReplies.h */,
-                                9B4790902531563200EC11AB /* MessageArgumentDescriptions.cpp */,
                                 51DD9F2616367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp */,
                                 51DD9F2716367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h */,
@@ -10944 +10935 @@
                                 C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */,
                                 2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */,
-                                9B47908F253151CC00EC11AB /* JSIPCBinding.h in Headers */,
                                 1AE49A4911FFA8CE0048B464 /* JSNPMethod.h in Headers */,
                                 1AE4987811FF7FAA0048B464 /* JSNPObject.h in Headers */,
@@ -10981 +10971 @@
                                 07E19EFD23D401F10094FFB4 /* MediaPlayerPrivateRemoteMessagesReplies.h in Headers */,
                                 51933DEF1965EB31008AC3EA /* MenuUtilities.h in Headers */,
-                                9B47908D25314D8300EC11AB /* MessageArgumentDescriptions.h in Headers */,
                                 1AC4C82916B876A90069DCCD /* MessageFlags.h in Headers */,
                                 1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */,
@@ -12852 +12841 @@
                                 2D92A779212B6A6100F493FD /* Logging.cpp in Sources */,
                                 07E19EFB23D401F10094FFB4 /* MediaPlayerPrivateRemoteMessageReceiver.cpp in Sources */,
-                                9B4790912531563200EC11AB /* MessageArgumentDescriptions.cpp in Sources */,
                                 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */,
                                 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */,

trunk/Source/WebKit/WebProcess/WebPage/IPCTestingAPI.cpp

@@ -32 +32 @@
 #include "FrameInfoData.h"
 #include "GPUProcessConnection.h"
-#include "MessageArgumentDescriptions.h"
+#include "MessageNames.h"
 #include "NetworkProcessConnection.h"
 #include "WebCoreArgumentCoders.h"
@@ -84 +84 @@
     static JSValueRef visitedLinkStoreID(JSContextRef, JSObjectRef, JSStringRef, JSValueRef* exception);
     static JSValueRef webPageProxyID(JSContextRef, JSObjectRef, JSStringRef, JSValueRef* exception);
-    static JSValueRef sessionID(JSContextRef, JSObjectRef, JSStringRef, JSValueRef* exception);
-    static JSValueRef pageID(JSContextRef, JSObjectRef, JSStringRef, JSValueRef* exception);
-    static JSValueRef frameID(JSContextRef, JSObjectRef, JSStringRef, JSValueRef* exception);
+    static JSValueRef frameIdentifier(JSContextRef, JSObjectRef, JSStringRef, JSValueRef* exception);
     static JSValueRef retrieveID(JSContextRef, JSObjectRef thisObject, JSValueRef* exception, const WTF::Function<uint64_t(JSIPC&)>&);
 
@@ -147 +145 @@
     static const JSStaticValue values[] = {
         { "visitedLinkStoreID", visitedLinkStoreID, 0, kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly },
-        { "frameID", frameID, 0, kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly },
-        { "pageID", pageID, 0, kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly },
-        { "sessionID", sessionID, 0, kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly },
         { "webPageProxyID", webPageProxyID, 0, kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly },
+        { "frameIdentifier", frameIdentifier, 0, kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly },
         { "messages", messages, 0, kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly },
         { 0, 0, 0, 0 }
@@ -242 +238 @@
 }
 
-template<typename PointType> bool encodePointType(IPC::Encoder& encoder, JSC::JSGlobalObject* globalObject, JSC::JSObject* jsObject, JSC::CatchScope& scope)
+template<typename RectType> bool encodeRectType(IPC::Encoder& encoder, JSC::JSGlobalObject* globalObject, JSC::JSObject* jsObject)
 {
     auto& vm = globalObject->vm();
     auto jsX = jsObject->get(globalObject, JSC::Identifier::fromString(vm, "x"_s));
-    if (scope.exception() || !jsX.isNumber())
+    if (!jsX.isNumber())
         return false;
     auto jsY = jsObject->get(globalObject, JSC::Identifier::fromString(vm, "y"_s));
-    if (scope.exception() || !jsY.isNumber())
-        return false;
-    encoder << PointType(jsX.asNumber(), jsY.asNumber());
-    return true;
-}
-
-template<typename RectType> bool encodeRectType(IPC::Encoder& encoder, JSC::JSGlobalObject* globalObject, JSC::JSObject* jsObject, JSC::CatchScope& scope)
-{
-    auto& vm = globalObject->vm();
-    auto jsX = jsObject->get(globalObject, JSC::Identifier::fromString(vm, "x"_s));
-    if (scope.exception() || !jsX.isNumber())
-        return false;
-    auto jsY = jsObject->get(globalObject, JSC::Identifier::fromString(vm, "y"_s));
-    if (scope.exception() || !jsY.isNumber())
+    if (!jsY.isNumber())
         return false;
     auto jsWidth = jsObject->get(globalObject, JSC::Identifier::fromString(vm, "width"_s));
-    if (scope.exception() || !jsWidth.isNumber())
+    if (!jsWidth.isNumber())
         return false;
     auto jsHeight = jsObject->get(globalObject, JSC::Identifier::fromString(vm, "height"_s));
-    if (scope.exception() || !jsHeight.isNumber())
+    if (!jsHeight.isNumber())
         return false;
     encoder << RectType(jsX.asNumber(), jsY.asNumber(), jsWidth.asNumber(), jsHeight.asNumber());
@@ -274 +257 @@
 }
 
-template<typename IntegralType> bool encodeNumericType(IPC::Encoder& encoder, JSC::JSValue jsValue)
+template<typename IntegralType> bool encodeIntegralType(IPC::Encoder& encoder, JSC::JSValue jsValue)
 {
     if (jsValue.isBigInt()) {
@@ -358 +341 @@
         return false;
 
-    if (type == "IntPoint") {
-        if (!encodePointType<WebCore::IntPoint>(encoder, globalObject, jsObject, scope)) {
-            *exception = createTypeError(context, "Failed to convert IntPoint"_s);
+    if (type == "IntRect") {
+        if (!encodeRectType<WebCore::IntRect>(encoder, globalObject, jsObject)) {
+            *exception = createTypeError(context, "Failed to convert IntRect"_s);
             return false;
         }
@@ -366 +349 @@
     }
 
-    if (type == "FloatPoint") {
-        if (!encodePointType<WebCore::IntPoint>(encoder, globalObject, jsObject, scope)) {
-            *exception = createTypeError(context, "Failed to convert FloatPoint"_s);
-            return false;
-        }
-        return true;
-    }
-
-    if (type == "IntRect") {
-        if (!encodeRectType<WebCore::IntRect>(encoder, globalObject, jsObject, scope)) {
-            *exception = createTypeError(context, "Failed to convert IntRect"_s);
-            return false;
-        }
-        return true;
-    }
-
     if (type == "FloatRect") {
-        if (!encodeRectType<WebCore::FloatRect>(encoder, globalObject, jsObject, scope)) {
+        if (!encodeRectType<WebCore::FloatRect>(encoder, globalObject, jsObject)) {
             *exception = createTypeError(context, "Failed to convert FloatRect"_s);
             return false;
@@ -416 +383 @@
     }
 
-    if (type == "URL") {
-        if (jsValue.isUndefinedOrNull()) {
-            encoder << URL { };
-            return true;
-        }
-        auto string = jsValue.toWTFString(globalObject);
-        if (scope.exception())
-            return false;
-        encoder << URL { URL { }, string };
-        return true;
-    }
-
-    if (type == "RegistrableDomain") {
-        if (jsValue.isUndefinedOrNull()) {
-            encoder << RegistrableDomain { };
-            return true;
-        }
-        auto string = jsValue.toWTFString(globalObject);
-        if (scope.exception())
-            return false;
-        encoder << RegistrableDomain { URL { URL { }, string } };
-        return true;
-    }
-
     if (type == "RGBA") {
         if (!jsValue.isNumber()) {
@@ -450 +393 @@
     }
 
-    bool numericResult;
+    bool integralResult;
     if (type == "bool")
-        numericResult = encodeNumericType<bool>(encoder, jsValue);
-    else if (type == "double")
-        numericResult = encodeNumericType<double>(encoder, jsValue);
-    else if (type == "float")
-        numericResult = encodeNumericType<float>(encoder, jsValue);
+        integralResult = encodeIntegralType<bool>(encoder, jsValue);
     else if (type == "int8_t")
-        numericResult = encodeNumericType<int8_t>(encoder, jsValue);
+        integralResult = encodeIntegralType<int8_t>(encoder, jsValue);
     else if (type == "int16_t")
-        numericResult = encodeNumericType<int16_t>(encoder, jsValue);
+        integralResult = encodeIntegralType<int16_t>(encoder, jsValue);
     else if (type == "int32_t")
-        numericResult = encodeNumericType<int32_t>(encoder, jsValue);
+        integralResult = encodeIntegralType<int32_t>(encoder, jsValue);
     else if (type == "int64_t")
-        numericResult = encodeNumericType<int64_t>(encoder, jsValue);
+        integralResult = encodeIntegralType<int64_t>(encoder, jsValue);
     else if (type == "uint8_t")
-        numericResult = encodeNumericType<uint8_t>(encoder, jsValue);
+        integralResult = encodeIntegralType<uint8_t>(encoder, jsValue);
     else if (type == "uint16_t")
-        numericResult = encodeNumericType<uint16_t>(encoder, jsValue);
+        integralResult = encodeIntegralType<uint16_t>(encoder, jsValue);
     else if (type == "uint32_t")
-        numericResult = encodeNumericType<uint32_t>(encoder, jsValue);
+        integralResult = encodeIntegralType<uint32_t>(encoder, jsValue);
     else if (type == "uint64_t")
-        numericResult = encodeNumericType<uint64_t>(encoder, jsValue);
+        integralResult = encodeIntegralType<uint64_t>(encoder, jsValue);
     else {
         *exception = createTypeError(context, "Bad type name"_s);
         return false;
     }
-    if (!numericResult) {
-        *exception = createTypeError(context, "Failed to encode a number"_s);
+    if (!integralResult) {
+        *exception = createTypeError(context, "Failed to encode an integer"_s);
         return false;
     }
     return true;
-}
-
-
-static JSC::JSObject* jsResultFromReplyDecoder(JSC::JSGlobalObject* globalObject, IPC::MessageName messageName, IPC::Decoder& decoder)
-{
-    auto& vm = globalObject->vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
-
-    auto arrayBuffer = JSC::ArrayBuffer::create(decoder.buffer(), decoder.length());
-    JSC::JSArrayBuffer* jsArrayBuffer = nullptr;
-    if (auto* structure = globalObject->arrayBufferStructure(arrayBuffer->sharingMode()))
-        jsArrayBuffer = JSC::JSArrayBuffer::create(vm, structure, WTFMove(arrayBuffer));
-    if (!jsArrayBuffer) {
-        throwException(globalObject, scope, JSC::createTypeError(globalObject, "Failed to create the array buffer for the reply"_s));
-        return nullptr;
-    }
-
-    auto jsReplyArguments = jsValueForReplyArguments(globalObject, messageName, decoder);
-    if (!jsReplyArguments) {
-        throwException(globalObject, scope, JSC::createTypeError(globalObject, "Failed to decode the reply"_s));
-        return nullptr;
-    }
-
-    if (jsReplyArguments->isEmpty()) {
-        throwException(globalObject, scope, JSC::createTypeError(globalObject, "Failed to convert the reply to an JS array"_s));
-        return nullptr;
-    }
-
-    auto catchScope = DECLARE_CATCH_SCOPE(vm);
-    JSC::JSObject* jsResult = constructEmptyObject(globalObject, globalObject->objectPrototype());
-    RETURN_IF_EXCEPTION(catchScope, nullptr);
-
-    jsResult->putDirect(vm, vm.propertyNames->arguments, *jsReplyArguments);
-    RETURN_IF_EXCEPTION(catchScope, nullptr);
-
-    jsResult->putDirect(vm, JSC::Identifier::fromString(vm, "buffer"), jsArrayBuffer);
-    RETURN_IF_EXCEPTION(catchScope, nullptr);
-
-    return jsResult;
 }
 
@@ -529 +429 @@
     auto jsIPC = makeRefPtr(toWrapped(context, thisObject));
     if (!jsIPC) {
-        *exception = createTypeError(context, "Wrong type"_s);
+        *exception = toRef(JSC::createTypeError(toJS(context), "Wrong type"_s));
         return JSValueMakeUndefined(context);
     }
 
     if (argumentCount < 3) {
-        *exception = createTypeError(context, "Must specify the target process, desination ID, and message ID as the first three arguments"_s);
+        *exception = toRef(JSC::createTypeError(toJS(context), "Must specify the target process, desination ID, and message ID as the first three arguments"_s));
         return JSValueMakeUndefined(context);
     }
@@ -550 +450 @@
         return JSValueMakeUndefined(context);
 
-    auto messageName = static_cast<IPC::MessageName>(*messageID);
-    auto encoder = makeUnique<IPC::Encoder>(messageName, *destinationID);
-
-    JSValueRef returnValue = JSValueMakeUndefined(context);
-
-    bool hasReply = !!messageReplyArgumentDescriptions(messageName);
-    if (hasReply) {
-        uint64_t listenerID = IPC::nextAsyncReplyHandlerID();
-        encoder->encode(listenerID);
-
-        JSObjectRef resolve;
-        JSObjectRef reject;
-ALLOW_NEW_API_WITHOUT_GUARDS_BEGIN
-        returnValue = JSObjectMakeDeferredPromise(context, &resolve, &reject, exception);
-ALLOW_NEW_API_WITHOUT_GUARDS_END
-        if (!returnValue)
-            return JSValueMakeUndefined(context);
-
-        JSGlobalContextRetain(JSContextGetGlobalContext(context));
-        JSValueProtect(context, resolve);
-        JSValueProtect(context, reject);
-        IPC::addAsyncReplyHandler(*connection, listenerID, [messageName, context, resolve, reject](IPC::Decoder* replyDecoder) {
-            auto* globalObject = toJS(context);
-            auto& vm = globalObject->vm();
-            JSC::JSLockHolder lock(vm);
-
-            auto scope = DECLARE_CATCH_SCOPE(vm);
-            auto* jsResult = jsResultFromReplyDecoder(globalObject, messageName, *replyDecoder);
-            if (auto* exception = scope.exception()) {
-                scope.clearException();
-                JSValueRef arguments[] = { toRef(globalObject, exception) };
-                JSObjectCallAsFunction(context, reject, reject, 1, arguments, nullptr);
-            } else {
-                JSValueRef arguments[] = { toRef(globalObject, jsResult) };
-                JSObjectCallAsFunction(context, resolve, resolve, 1, arguments, nullptr);
-            }
-
-            JSValueUnprotect(context, reject);
-            JSValueUnprotect(context, resolve);
-            JSGlobalContextRelease(JSContextGetGlobalContext(context));
-        });
-    }
+    auto encoder = makeUnique<IPC::Encoder>(static_cast<IPC::MessageName>(static_cast<uint64_t>(*messageID)), *destinationID);
 
     if (argumentCount > 3) {
@@ -602 +461 @@
     connection->sendMessage(WTFMove(encoder), { });
 
-    return returnValue;
+    return JSValueMakeUndefined(context);
 }
 
@@ -611 +470 @@
     auto jsIPC = makeRefPtr(toWrapped(context, thisObject));
     if (!jsIPC) {
-        *exception = createTypeError(context, "Wrong type"_s);
+        *exception = toRef(JSC::createTypeError(toJS(context), "Wrong type"_s));
         return JSValueMakeUndefined(context);
     }
 
     if (argumentCount < 4) {
-        *exception = createTypeError(context, "Must specify the target process, desination ID, and message ID as the first three arguments"_s);
+        *exception = toRef(JSC::createTypeError(toJS(context), "Must specify the target process, desination ID, message ID, and timeout as the first four arguments"_s));
         return JSValueMakeUndefined(context);
     }
@@ -636 +495 @@
         auto jsValue = toJS(globalObject, arguments[3]);
         if (!jsValue.isNumber()) {
-            *exception = createTypeError(context, "Timeout must be a number"_s);
+            *exception = toRef(JSC::createTypeError(globalObject, "timeout must be a number"_s));
             return JSValueMakeUndefined(context);
         }
         timeout = Seconds { jsValue.asNumber() };
     }
-
+    
     // FIXME: Support the options.
 
     uint64_t syncRequestID = 0;
-    auto messageName = static_cast<IPC::MessageName>(*messageID);
-    auto encoder = connection->createSyncMessageEncoder(messageName, *destinationID, syncRequestID);
+    auto encoder = connection->createSyncMessageEncoder(static_cast<IPC::MessageName>(static_cast<uint64_t>(*messageID)), *destinationID, syncRequestID);
 
     if (argumentCount > 4) {
@@ -653 +511 @@
     }
 
-    if (auto replyDecoder = connection->sendSyncMessage(syncRequestID, WTFMove(encoder), timeout, { })) {
-        auto scope = DECLARE_CATCH_SCOPE(globalObject->vm());
-        auto* jsResult = jsResultFromReplyDecoder(globalObject, messageName, *replyDecoder);
-        if (scope.exception()) {
-            *exception = toRef(globalObject, scope.exception());
-            scope.clearException();
-            return JSValueMakeUndefined(context);
-        }
-        return toRef(globalObject, jsResult);
-    }
+    auto replyDecoder = connection->sendSyncMessage(syncRequestID, WTFMove(encoder), timeout, { });
+    // FIXME: Decode the reply.
 
     return JSValueMakeUndefined(context);
@@ -675 +525 @@
 }
 
-JSValueRef JSIPC::frameID(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef* exception)
+JSValueRef JSIPC::webPageProxyID(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef* exception)
+{
+    return retrieveID(context, thisObject, exception, [](JSIPC& wrapped) {
+        return wrapped.m_webPage->webPageProxyID();
+    });
+}
+
+JSValueRef JSIPC::frameIdentifier(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef* exception)
 {
     return retrieveID(context, thisObject, exception, [](JSIPC& wrapped) {
@@ -682 +539 @@
 }
 
-JSValueRef JSIPC::pageID(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef* exception)
-{
-    return retrieveID(context, thisObject, exception, [](JSIPC& wrapped) {
-        return wrapped.m_webPage->identifier().toUInt64();
-    });
-}
-
-JSValueRef JSIPC::sessionID(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef* exception)
-{
-    return retrieveID(context, thisObject, exception, [](JSIPC& wrapped) {
-        return wrapped.m_webPage->sessionID().toUInt64();
-    });
-}
-
-JSValueRef JSIPC::webPageProxyID(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef* exception)
-{
-    return retrieveID(context, thisObject, exception, [](JSIPC& wrapped) {
-        return wrapped.m_webPage->webPageProxyID();
-    });
-}
-
 JSValueRef JSIPC::retrieveID(JSContextRef context, JSObjectRef thisObject, JSValueRef* exception, const WTF::Function<uint64_t(JSIPC&)>& callback)
 {
@@ -720 +556 @@
 }
 
-static JSC::JSValue createJSArrayForArgumentDescriptions(JSC::JSGlobalObject* globalObject, Optional<Vector<IPC::ArgumentDescription>>&& argumentDescriptions)
-{
-    if (!argumentDescriptions)
-        return JSC::jsNull();
-
-    auto& vm = globalObject->vm();
-    auto scope = DECLARE_CATCH_SCOPE(vm);
-    JSC::JSObject* argumentsArray = JSC::constructEmptyArray(globalObject, nullptr);
-    RETURN_IF_EXCEPTION(scope, JSC::jsTDZValue());
-
-    for (unsigned argumentIndex = 0; argumentIndex < argumentDescriptions->size(); ++argumentIndex) {
-        auto& description = argumentDescriptions->at(argumentIndex);
-        JSC::JSObject* jsDescriptions = constructEmptyObject(globalObject, globalObject->objectPrototype());
-        RETURN_IF_EXCEPTION(scope, JSC::jsTDZValue());
-
-        argumentsArray->putDirectIndex(globalObject, argumentIndex, jsDescriptions);
-        RETURN_IF_EXCEPTION(scope, JSC::jsTDZValue());
-
-        jsDescriptions->putDirect(vm, JSC::Identifier::fromString(vm, "name"), JSC::jsString(vm, String(description.name)));
-        RETURN_IF_EXCEPTION(scope, JSC::jsTDZValue());
-
-        jsDescriptions->putDirect(vm, JSC::Identifier::fromString(vm, "type"), JSC::jsString(vm, String(description.type)));
-        RETURN_IF_EXCEPTION(scope, JSC::jsTDZValue());
-
-        jsDescriptions->putDirect(vm, JSC::Identifier::fromString(vm, "optional"), JSC::jsBoolean(description.isOptional));
-        RETURN_IF_EXCEPTION(scope, JSC::jsTDZValue());
-
-        if (description.enumName) {
-            jsDescriptions->putDirect(vm, JSC::Identifier::fromString(vm, "enum"), JSC::jsString(vm, String(description.enumName)));
-            RETURN_IF_EXCEPTION(scope, JSC::jsTDZValue());
-        }
-    }
-    return argumentsArray;
-}
-
 JSValueRef JSIPC::messages(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef* exception)
 {
@@ -767 +568 @@
     }
 
-    auto scope = DECLARE_CATCH_SCOPE(vm);
     JSC::JSObject* messagesObject = constructEmptyObject(globalObject, globalObject->objectPrototype());
-    RETURN_IF_EXCEPTION(scope, JSValueMakeUndefined(context));
-
     auto nameIdent = JSC::Identifier::fromString(vm, "name");
-    auto replyArgumentsIdent = JSC::Identifier::fromString(vm, "replyArguments");
     for (unsigned i = 0; i < static_cast<unsigned>(IPC::MessageName::Last); ++i) {
-        auto name = static_cast<IPC::MessageName>(i);
+        auto* messageName = description(static_cast<IPC::MessageName>(i));
 
         JSC::JSObject* dictionary = constructEmptyObject(globalObject, globalObject->objectPrototype());
-        RETURN_IF_EXCEPTION(scope, JSValueMakeUndefined(context));
-
         dictionary->putDirect(vm, nameIdent, JSC::JSValue(i));
-        RETURN_IF_EXCEPTION(scope, JSValueMakeUndefined(context));
-
-        auto argumentDescriptions = createJSArrayForArgumentDescriptions(globalObject, IPC::messageArgumentDescriptions(name));
-        if (argumentDescriptions.isEmpty())
-            return JSValueMakeUndefined(context);
-        dictionary->putDirect(vm, vm.propertyNames->arguments, argumentDescriptions);            
-        RETURN_IF_EXCEPTION(scope, JSValueMakeUndefined(context));
-
-        auto replyArgumentDescriptions = createJSArrayForArgumentDescriptions(globalObject, IPC::messageReplyArgumentDescriptions(name));
-        if (replyArgumentDescriptions.isEmpty())
-            return JSValueMakeUndefined(context);
-        dictionary->putDirect(vm, replyArgumentsIdent, replyArgumentDescriptions);            
-        RETURN_IF_EXCEPTION(scope, JSValueMakeUndefined(context));
-
-        messagesObject->putDirect(vm, JSC::Identifier::fromString(vm, description(name)), dictionary);
-        RETURN_IF_EXCEPTION(scope, JSValueMakeUndefined(context));
+
+        // FIXME: Add argument names.
+
+        messagesObject->putDirect(vm, JSC::Identifier::fromString(vm, messageName), dictionary);
     }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-14  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r268431 and r268443.
+        https://bugs.webkit.org/show_bug.cgi?id=217728
+
+        Broke debug builds of GTK, WinCairo and Playstation ports
+
+        Reverted changesets:
+
+        "IPC testing JS API should expose a reply and describe the
+        list of arguments for each message"
+        https://bugs.webkit.org/show_bug.cgi?id=217565
+        https://trac.webkit.org/changeset/268431
+
+        "IPC testing JS API should expose a reply and describe the
+        list of arguments for each message"
+        https://bugs.webkit.org/show_bug.cgi?id=217565
+        https://trac.webkit.org/changeset/268443
+
 2020-10-14  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/IPCTestingAPI.mm

@@ -35 +35 @@
 
 static bool done = false;
-static bool didCrash = false;
 static RetainPtr<NSString> alertMessage;
-static RetainPtr<NSString> promptDefault;
-static RetainPtr<NSString> promptResult;
 
-@interface IPCTestingAPIDelegate : NSObject <WKUIDelegate, WKNavigationDelegate>
+@interface IPCTestingAPIDelegate : NSObject <WKUIDelegate>
 @end
     
@@ -50 +47 @@
     done = true;
     completionHandler();
-}
-
-- (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString * _Nullable))completionHandler
-{
-    promptDefault = defaultText;
-    done = true;
-    completionHandler(promptResult.get());
-}
-
-- (void)_webView:(WKWebView *)webView webContentProcessDidTerminateWithReason:(_WKProcessTerminationReason)reason
-{
-    didCrash = false;
-    done = true;
 }
 
@@ -98 +82 @@
     done = false;
     [webView synchronouslyLoadHTMLString:@"<!DOCTYPE html><script>IPC.sendSyncMessage('UI', IPC.webPageProxyID, IPC.messages.WebPageProxy_RunJavaScriptAlert.name, 100,"
-        "[{type: 'uint64_t', value: IPC.frameID}, {type: 'FrameInfoData'}, {'type': 'String', 'value': 'hi'}]);</script>"];
+        "[{type: 'uint64_t', value: IPC.frameIdentifier}, {type: 'FrameInfoData'}, {'type': 'String', 'value': 'hi'}]);</script>"];
     TestWebKitAPI::Util::run(&done);
 
@@ -104 +88 @@
 }
 
-TEST(IPCTestingAPI, DecodesReplyArgumentsForPrompt)
-{
-    RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    for (_WKInternalDebugFeature *feature in [WKPreferences _internalDebugFeatures]) {
-        if ([feature.key isEqualToString:@"IPCTestingAPIEnabled"]) {
-            [[configuration preferences] _setEnabled:YES forInternalDebugFeature:feature];
-            break;
-        }
-    }
-    RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration.get()]);
-
-    auto delegate = adoptNS([[IPCTestingAPIDelegate alloc] init]);
-    [webView setUIDelegate:delegate.get()];
-
-    done = false;
-    promptResult = @"foo";
-    [webView synchronouslyLoadHTMLString:@"<!DOCTYPE html><script>result = IPC.sendSyncMessage('UI', IPC.webPageProxyID, IPC.messages.WebPageProxy_RunJavaScriptPrompt.name, 100,"
-        "[{type: 'uint64_t', value: IPC.frameID}, {type: 'FrameInfoData'}, {'type': 'String', 'value': 'hi'}, {'type': 'String', 'value': 'bar'}]);</script>"];
-    TestWebKitAPI::Util::run(&done);
-
-    EXPECT_STREQ([promptDefault UTF8String], "bar");
-    EXPECT_STREQ([[webView stringByEvaluatingJavaScript:@"JSON.stringify(result.arguments)"] UTF8String], "[{\"type\":\"String\",\"value\":\"foo\"}]");
-}
-
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
-TEST(IPCTestingAPI, DecodesReplyArgumentsForAsyncMessage)
-{
-    RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    for (_WKInternalDebugFeature *feature in [WKPreferences _internalDebugFeatures]) {
-        if ([feature.key isEqualToString:@"IPCTestingAPIEnabled"]) {
-            [[configuration preferences] _setEnabled:YES forInternalDebugFeature:feature];
-            break;
-        }
-    }
-    RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration.get()]);
-
-    auto delegate = adoptNS([[IPCTestingAPIDelegate alloc] init]);
-    [webView setUIDelegate:delegate.get()];
-
-    done = false;
-    promptResult = @"foo";
-    [webView synchronouslyLoadHTMLString:@"<!DOCTYPE html><script>IPC.sendMessage(\"Networking\", 0, IPC.messages.NetworkConnectionToWebProcess_HasStorageAccess.name,"
-        "[{type: 'RegistrableDomain', value: 'https://ipctestingapi.com'}, {type: 'RegistrableDomain', value: 'https://webkit.org'}, {type: 'uint64_t', value: IPC.frameID},"
-        "{type: 'uint64_t', value: IPC.pageID}]).then((result) => alert(JSON.stringify(result.arguments)));</script>"];
-    TestWebKitAPI::Util::run(&done);
-
-    EXPECT_STREQ([alertMessage UTF8String], "[{\"type\":\"bool\",\"value\":false}]");
-}
 #endif
-
-TEST(IPCTestingAPI, DescribesArguments)
-{
-    RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    for (_WKInternalDebugFeature *feature in [WKPreferences _internalDebugFeatures]) {
-        if ([feature.key isEqualToString:@"IPCTestingAPIEnabled"]) {
-            [[configuration preferences] _setEnabled:YES forInternalDebugFeature:feature];
-            break;
-        }
-    }
-    RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration.get()]);
-
-    auto delegate = adoptNS([[IPCTestingAPIDelegate alloc] init]);
-    [webView setUIDelegate:delegate.get()];
-
-    done = false;
-    [webView synchronouslyLoadHTMLString:@"<!DOCTYPE html><script>window.args = IPC.messages.WebPageProxy_RunJavaScriptAlert.arguments; alert('ok')</script>"];
-    TestWebKitAPI::Util::run(&done);
-
-    EXPECT_STREQ([[webView stringByEvaluatingJavaScript:@"args.length"] UTF8String], "3");
-    EXPECT_STREQ([[webView stringByEvaluatingJavaScript:@"args[0].type"] UTF8String], "WebCore::FrameIdentifier");
-    EXPECT_STREQ([[webView stringByEvaluatingJavaScript:@"args[1].type"] UTF8String], "WebKit::FrameInfoData");
-    EXPECT_STREQ([[webView stringByEvaluatingJavaScript:@"args[2].name"] UTF8String], "message");
-    EXPECT_STREQ([[webView stringByEvaluatingJavaScript:@"args[2].type"] UTF8String], "String");
-}
-
-#endif