mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-28 11:49:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb/CSS: Allow bare zero for gradient angles

Browse source 
Corresponds to f952e97da9
This commit is contained in:
Sam Atkins 2025-03-18 14:34:23 +00:00
commit 97e917bdf5
Notes: github-actions[bot] 2025-03-18 20:05:02 +00:00
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Libraries/LibWeb/CSS/Parser/GradientParsing.cpp
View file

@ -251,7 +251,7 @@ RefPtr<LinearGradientStyleValue> Parser::parse_linear_gradient_function(TokenStr
if (!function_name.equals_ignoring_ascii_case("linear-gradient"sv)) if (!function_name.equals_ignoring_ascii_case("linear-gradient"sv))
return nullptr; return nullptr;
// <linear-gradient-syntax> = [ [ <angle> | to <side-or-corner> ] || <color-interpolation-method> ]? , <color-stop-list> // <linear-gradient-syntax> = [ [ <angle> | <zero> | to <side-or-corner> ] || <color-interpolation-method> ]? , <color-stop-list>
TokenStream tokens { component_value.function().value }; TokenStream tokens { component_value.function().value };
tokens.discard_whitespace(); tokens.discard_whitespace();
@ -290,7 +290,7 @@ RefPtr<LinearGradientStyleValue> Parser::parse_linear_gradient_function(TokenStr
auto const& first_param = tokens.next_token(); auto const& first_param = tokens.next_token();
if (first_param.is(Token::Type::Dimension)) { if (first_param.is(Token::Type::Dimension)) {
// <angle> // <angle>
tokens.discard_a_token(); tokens.discard_a_token(); // <angle>
auto angle_value = first_param.token().dimension_value(); auto angle_value = first_param.token().dimension_value();
auto unit_string = first_param.token().dimension_unit(); auto unit_string = first_param.token().dimension_unit();
auto angle_type = Angle::unit_from_name(unit_string); auto angle_type = Angle::unit_from_name(unit_string);
@ -299,6 +299,10 @@ RefPtr<LinearGradientStyleValue> Parser::parse_linear_gradient_function(TokenStr
return nullptr; return nullptr;
gradient_direction = Angle { angle_value, angle_type.release_value() }; gradient_direction = Angle { angle_value, angle_type.release_value() };
} else if (first_param.is(Token::Type::Number) && first_param.token().number().value() == 0) {
// <zero>
tokens.discard_a_token(); // <zero>
gradient_direction = Angle::make_degrees(0);
} else if (is_to_side_or_corner(first_param)) { } else if (is_to_side_or_corner(first_param)) {
// <side-or-corner> = [left | right] || [top | bottom] // <side-or-corner> = [left | right] || [top | bottom]
@ -396,7 +400,7 @@ RefPtr<ConicGradientStyleValue> Parser::parse_conic_gradient_function(TokenStrea
RefPtr<PositionStyleValue> at_position; RefPtr<PositionStyleValue> at_position;
Optional<InterpolationMethod> maybe_interpolation_method; Optional<InterpolationMethod> maybe_interpolation_method;
// conic-gradient( [ [ [ from <angle> ]? [ at <position> ]? ] || <color-interpolation-method> ]? , <angular-color-stop-list> ) // conic-gradient( [ [ [ from [ <angle> | <zero> ] ]? [ at <position> ]? ] || <color-interpolation-method> ]? , <angular-color-stop-list> )
NonnullRawPtr<ComponentValue const> token = tokens.next_token(); NonnullRawPtr<ComponentValue const> token = tokens.next_token();
bool got_from_angle = false; bool got_from_angle = false;
bool got_color_interpolation_method = false; bool got_color_interpolation_method = false;
@ -413,23 +417,28 @@ RefPtr<ConicGradientStyleValue> Parser::parse_conic_gradient_function(TokenStrea
}; };
if (consume_identifier("from"sv)) { if (consume_identifier("from"sv)) {
// from <angle> // from [ <angle> | <zero> ]
if (got_from_angle || got_at_position) if (got_from_angle || got_at_position)
return nullptr; return nullptr;
if (!tokens.has_next_token()) if (!tokens.has_next_token())
return nullptr; return nullptr;
auto const& angle_token = tokens.consume_a_token(); auto const& angle_token = tokens.consume_a_token();
if (!angle_token.is(Token::Type::Dimension)) if (angle_token.is(Token::Type::Dimension)) {
return nullptr; auto angle = angle_token.token().dimension_value();
auto angle = angle_token.token().dimension_value(); auto angle_unit = angle_token.token().dimension_unit();
auto angle_unit = angle_token.token().dimension_unit(); auto angle_type = Angle::unit_from_name(angle_unit);
auto angle_type = Angle::unit_from_name(angle_unit); if (!angle_type.has_value())
if (!angle_type.has_value()) return nullptr;
return nullptr;
from_angle = Angle(angle, *angle_type); from_angle = Angle(angle, *angle_type);
got_from_angle = true; got_from_angle = true;
} else if (angle_token.is(Token::Type::Number) && angle_token.token().number().value() == 0) {
from_angle = Angle::make_degrees(0);
got_from_angle = true;
} else {
return nullptr;
}
} else if (consume_identifier("at"sv)) { } else if (consume_identifier("at"sv)) {
// at <position> // at <position>
if (got_at_position) if (got_at_position)