dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibWeb: Remove FlyString property-name overload

Browse source 
Remove the PropertyNameAndID::from_name overload that accepted
FlyString. Parser declarations still store their token names as
FlyString, but the conversion to UTF-16 now happens explicitly at those
boundaries.
This commit is contained in:
Andreas Kling 2026-06-08 20:41:01 +02:00 committed by Andreas Kling
parent 7272c26c7b
commit df7c715b4e
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -1663,7 +1663,7 @@ Vector<DevToolsStyleDeclaration> Parser::parse_as_devtools_property_declaration_
for (auto const& rule_or_list : declarations_and_at_rules) {
if (auto* rule_declarations = rule_or_list.get_pointer<Vector<Declaration>>()) {
for (auto const& declaration : *rule_declarations) {
auto property = PropertyNameAndID::from_name(declaration.name);
auto property = PropertyNameAndID::from_name(Utf16FlyString::from_utf8(declaration.name));
StringBuilder value_builder;
for (auto const& value : declaration.value)
@ -1765,7 +1765,7 @@ bool Parser::is_valid_in_the_current_context(Declaration const& declaration) con
// The <declaration-list> inside of <keyframe-block> accepts any CSS property except those defined in this
// specification, but does accept the animation-timing-function property and interprets it specially
// NB: animation-composition is defined in CSS Animations Level 2, so it is not excluded by this rule.
auto property = PropertyNameAndID::from_name(declaration.name);
auto property = PropertyNameAndID::from_name(Utf16FlyString::from_utf8(declaration.name));
if (!property.has_value())
return true;
switch (property->id()) {
@ -1957,7 +1957,7 @@ GC::Ref<CSSStyleProperties> Parser::convert_to_style_declaration(Vector<Declarat
Optional<StylePropertyAndName> Parser::convert_to_style_property(Declaration const& declaration)
{
auto property = PropertyNameAndID::from_name(declaration.name);
auto property = PropertyNameAndID::from_name(Utf16FlyString::from_utf8(declaration.name));
if (!property.has_value()) {
if (has_ignored_vendor_prefix(declaration.name)) {

5
Libraries/LibWeb/CSS/PropertyNameAndID.h
View file

@ -30,11 +30,6 @@ public:
return {};
}
static Optional<PropertyNameAndID> from_name(FlyString const& name)
{
return from_name(Utf16FlyString::from_utf8(name));
}
static PropertyNameAndID from_id(PropertyID property_id)
{
VERIFY(property_id != PropertyID::Custom);

2
Libraries/LibWeb/CSS/StyleComputer.cpp
View file

@ -1588,7 +1588,7 @@ static JsonArray serialize_devtools_style_declarations(DOM::Document const& docu
for (auto const& declaration : declarations) {
bool inherits = declaration.is_custom_property
? custom_property_inherits(document, Utf16FlyString::from_utf8(declaration.name))
: PropertyNameAndID::from_name(declaration.name)
: PropertyNameAndID::from_name(Utf16FlyString::from_utf8(declaration.name))
.map([](auto const& property) { return !property.is_custom_property() && is_inherited_property(property.id()); })
.value_or(false);