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

LibWeb: Use more verbose input in CSS transform function generator

Browse source
This commit is contained in:
Aliaksandr Kalenik 2022-10-26 16:09:20 +03:00 • committed by Sam Atkins
parent 4bf587811f
commit f099e2aa12
3 changed files with 94 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5531,7 +5531,13 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<ComponentValue> const& c
NonnullRefPtrVector<StyleValue> values;
auto argument_tokens = TokenStream { part.function().values() };
argument_tokens.skip_whitespace();
size_t argument_index = 0;
while (argument_tokens.has_next_token()) {
if (argument_index == function_metadata.parameters.size()) {
dbgln_if(CSS_PARSER_DEBUG, "Too many arguments to {}. max: {}", part.function().name(), function_metadata.parameters.size());
return nullptr;
}
auto const& value = argument_tokens.next_token();
RefPtr<CalculatedStyleValue> maybe_calc_value;
if (auto maybe_dynamic_value = parse_dynamic_value(value)) {
@ -5542,7 +5548,7 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<ComponentValue> const& c
maybe_calc_value = maybe_dynamic_value->as_calculated();
}
switch (function_metadata.parameter_type) {
switch (function_metadata.parameters[argument_index].type) {
case TransformFunctionParameterType::Angle: {
// These are `<angle> | <zero>` in the spec, so we have to check for both kinds.
if (maybe_calc_value && maybe_calc_value->resolves_to_angle()) {
@ -5596,15 +5602,12 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<ComponentValue> const& c
if (!argument_tokens.has_next_token())
return nullptr;
}
argument_index++;
}
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());
if (argument_index < function_metadata.parameters.size() && function_metadata.parameters[argument_index].required) {
dbgln_if(CSS_PARSER_DEBUG, "Required parameter at position {} is missing", argument_index);
return nullptr;
}

63
Userland/Libraries/LibWeb/CSS/TransformFunctions.json
View file

@ -1,47 +1,80 @@
{
"matrix": {
"parameters": "<number>{6}"
"parameters": [
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true }
]
},
"matrix3d": {
"parameters": "<number>{16}"
"parameters": [
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": true }
]
},
"translate": {
"parameters": "<length-percentage>{1,2}"
"parameters": [
{ "type": "<length-percentage>", "required": true },
{ "type": "<length-percentage>", "required": false }
]
},
"translateX": {
"parameters": "<length-percentage>"
"parameters": [{ "type": "<length-percentage>", "required": true }]
},
"translateY": {
"parameters": "<length-percentage>"
"parameters": [{ "type": "<length-percentage>", "required": true }]
},
"scale": {
"parameters": "<number>{1,2}"
"parameters": [
{ "type": "<number>", "required": true },
{ "type": "<number>", "required": false }
]
},
"scaleX": {
"parameters": "<number>"
"parameters": [{ "type": "<number>", "required": true }]
},
"scaleY": {
"parameters": "<number>"
"parameters": [{ "type": "<number>", "required": true }]
},
"rotate": {
"parameters": "<angle>"
"parameters": [{ "type": "<angle>", "required": true }]
},
"rotateX": {
"parameters": "<angle>"
"parameters": [{ "type": "<angle>", "required": true }]
},
"rotateY": {
"parameters": "<angle>"
"parameters": [{ "type": "<angle>", "required": true }]
},
"rotateZ": {
"parameters": "<angle>"
"parameters": [{ "type": "<angle>", "required": true }]
},
"skew": {
"parameters": "<angle>{1,2}"
"parameters": [
{ "type": "<angle>", "required": true },
{ "type": "<angle>", "required": false }
]
},
"skewX": {
"parameters": "<angle>"
"parameters": [{ "type": "<angle>", "required": true }]
},
"skewY": {
"parameters": "<angle>"
"parameters": [{ "type": "<angle>", "required": true }]
}
}