RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:07:34 +00:00
Code Issues Activity Actions

LibWeb: Remove support for RefPtr types in idl_type_name_to_cpp_type()

Browse source 
This is not used anymore.
This commit is contained in:
Linus Groh 2022-09-21 17:40:39 +01:00
parent 38b3ce8f03
commit 64a1992040
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp
View file

@ -201,16 +201,8 @@ static String union_type_to_variant(UnionType const& union_type, Interface const
CppType idl_type_name_to_cpp_type(Type const& type, Interface const& interface) CppType idl_type_name_to_cpp_type(Type const& type, Interface const& interface)
{ {
if (is_wrappable_type(type)) { if (is_wrappable_type(type))
if (impl_is_wrapper(type)) { return { .name = String::formatted("JS::Handle<{}>", type.name()), .sequence_storage_type = SequenceStorageType::MarkedVector };
return { .name = String::formatted("JS::Handle<{}>", type.name()), .sequence_storage_type = SequenceStorageType::MarkedVector };
}
if (type.is_nullable())
return { .name = String::formatted("RefPtr<{}>", type.name()), .sequence_storage_type = SequenceStorageType::Vector };
return { .name = String::formatted("NonnullRefPtr<{}>", type.name()), .sequence_storage_type = SequenceStorageType::Vector };
}
if (type.is_string()) if (type.is_string())
return { .name = "String", .sequence_storage_type = SequenceStorageType::Vector }; return { .name = "String", .sequence_storage_type = SequenceStorageType::Vector };
@ -1052,6 +1044,8 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter
if (is<PlatformObject>(@js_name@@js_suffix@_object)) { if (is<PlatformObject>(@js_name@@js_suffix@_object)) {
)~~~"); )~~~");
// NOTE: This codegen assumes that all union types are cells or values we can create a handle for.
// 1. If types includes an interface type that V implements, then return the IDL value that is a reference to the object V. // 1. If types includes an interface type that V implements, then return the IDL value that is a reference to the object V.
for (auto& type : types) { for (auto& type : types) {
if (!IDL::is_wrappable_type(type)) if (!IDL::is_wrappable_type(type))
@ -1059,19 +1053,17 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter
auto union_platform_object_type_generator = union_generator.fork(); auto union_platform_object_type_generator = union_generator.fork();
union_platform_object_type_generator.set("platform_object_type", type.name()); union_platform_object_type_generator.set("platform_object_type", type.name());
auto cpp_type = IDL::idl_type_name_to_cpp_type(type, interface);
union_platform_object_type_generator.set("refptr_type", cpp_type.name);
union_platform_object_type_generator.append(R"~~~( union_platform_object_type_generator.append(R"~~~(
if (is<@platform_object_type@>(@js_name@@js_suffix@_object)) if (is<@platform_object_type@>(@js_name@@js_suffix@_object))
return @refptr_type@ { static_cast<@platform_object_type@&>(@js_name@@js_suffix@_object).impl() }; return JS::make_handle(static_cast<@platform_object_type@&>(@js_name@@js_suffix@_object));
)~~~"); )~~~");
} }
// 2. If types includes object, then return the IDL value that is a reference to the object V. // 2. If types includes object, then return the IDL value that is a reference to the object V.
if (includes_object) { if (includes_object) {
union_generator.append(R"~~~( union_generator.append(R"~~~(
return @js_name@@js_suffix@_object; return JS::make_handle(@js_name@@js_suffix@_object);
)~~~"); )~~~");
} }