RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-19 18:57:40 +00:00
Code Issues Activity Actions

LibWeb: Use TransformFunctionMetadata when parsing their arguments

Browse source 
Now, the parser will reject a transform function if:
- There are too many arguments.
- There are too few arguments.
- An argument is the wrong type.
This commit is contained in:
Sam Atkins 2022-04-17 17:37:27 +01:00 • committed by Andreas Kling
parent 42d87239a8
commit a52f6fb5b0
1 changed files with 41 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -4787,6 +4787,8 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<ComponentValue> const& c
auto maybe_function = transform_function_from_string(part.function().name()); auto maybe_function = transform_function_from_string(part.function().name());
if (!maybe_function.has_value()) if (!maybe_function.has_value())
return nullptr; return nullptr;
auto function = maybe_function.release_value();
auto function_metadata = transform_function_metadata(function);
bool expect_comma = false; bool expect_comma = false;
NonnullRefPtrVector<StyleValue> values; NonnullRefPtrVector<StyleValue> values;
@ -4802,35 +4804,56 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<ComponentValue> const& c
} else if (expect_comma) } else if (expect_comma)
return nullptr; return nullptr;
if (value.is(Token::Type::Dimension)) { // FIXME: Allow calc() parameters.
auto dimension = parse_dimension(value);
if (!dimension.has_value()) switch (function_metadata.parameter_type) {
case TransformFunctionParameterType::Angle: {
// These are `<angle> | <zero>` in the spec, so we have to check for both kinds.
if (value.is(Token::Type::Number) && value.token().number_value() == 0) {
values.append(AngleStyleValue::create(Angle::make_degrees(0)));
} else {
auto dimension_value = parse_dimension_value(value);
if (!dimension_value || !dimension_value->is_angle())
return nullptr;
values.append(dimension_value.release_nonnull());
}
break;
}
case TransformFunctionParameterType::LengthPercentage: {
auto dimension_value = parse_dimension_value(value);
if (!dimension_value)
return nullptr; return nullptr;
auto dimension_value = dimension.release_value(); if (dimension_value->is_percentage() || dimension_value->is_length())
if (dimension_value.is_length()) values.append(dimension_value.release_nonnull());
values.append(LengthStyleValue::create(dimension_value.length()));
else if (dimension_value.is_angle())
values.append(AngleStyleValue::create(dimension_value.angle()));
else else
return nullptr; return nullptr;
} else if (value.is(Token::Type::Number)) {
break;
}
case TransformFunctionParameterType::Number: {
auto number = parse_numeric_value(value); auto number = parse_numeric_value(value);
if (!number)
return nullptr;
values.append(number.release_nonnull()); values.append(number.release_nonnull());
} else if (value.is(Token::Type::Percentage)) { break;
auto percentage = parse_dimension_value(value); }
if (!percentage || !percentage->is_percentage())
return nullptr;
values.append(percentage.release_nonnull());
} else {
dbgln_if(CSS_PARSER_DEBUG, "FIXME: Unsupported value type for transformation!");
return nullptr;
} }
expect_comma = true; expect_comma = true;
} }
transformations.append(TransformationStyleValue::create(maybe_function.value(), move(values))); if (values.size() < function_metadata.min_parameters) {
dbgln_if(CSS_PARSER_DEBUG, "Not enough arguments to {}. min: {}, given: {}", part.function().name(), function_metadata.min_parameters, values.size());
return nullptr;
}
if (values.size() > function_metadata.max_parameters) {
dbgln_if(CSS_PARSER_DEBUG, "Too many arguments to {}. max: {}, given: {}", part.function().name(), function_metadata.max_parameters, values.size());
return nullptr;
}
transformations.append(TransformationStyleValue::create(function, move(values)));
} }
return StyleValueList::create(move(transformations), StyleValueList::Separator::Space); return StyleValueList::create(move(transformations), StyleValueList::Separator::Space);
} }