From 114120852de801fb83fc83c7357eff36a0d34ad2 Mon Sep 17 00:00:00 2001 From: Kenneth Myhra Date: Thu, 21 Jul 2022 22:41:59 +0200 Subject: [PATCH] LibWeb/IDL: Handle passing ArrayBuffer to an IDL union type This fixes a bug where an ArrayBuffer passed to the Blob constructor would just be stringified to: "[object ArrayBuffer]". --- .../LibWeb/WrapperGenerator/IDLGenerators.cpp | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp index b33ef70b06..8d267a4254 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp @@ -1001,9 +1001,22 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter )~~~"); } - // FIXME: 6. If Type(V) is Object and V has an [[ArrayBufferData]] internal slot, then - // 1. If types includes ArrayBuffer, then return the result of converting V to ArrayBuffer. - // 2. If types includes object, then return the IDL value that is a reference to the object V. + // 6. If Type(V) is Object and V has an [[ArrayBufferData]] internal slot, then + // 1. If types includes ArrayBuffer, then return the result of converting V to ArrayBuffer. + for (auto& type : types) { + if (type.name == "BufferSource") { + union_generator.append(R"~~~( + if (is(@js_name@@js_suffix@_object)) + return JS::make_handle(@js_name@@js_suffix@_object); +)~~~"); + } + } + // 2. If types includes object, then return the IDL value that is a reference to the object V. + if (includes_object) { + union_generator.append(R"~~~( + return @js_name@@js_suffix@_object; +)~~~"); + } // FIXME: 7. If Type(V) is Object and V has a [[DataView]] internal slot, then: // 1. If types includes DataView, then return the result of converting V to DataView. @@ -2835,6 +2848,7 @@ void generate_constructor_implementation(IDL::Interface const& interface) #include #include #include +#include #include #include #include