0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-03 21:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb: Parse dimension values using TokenStream

Browse source
This commit is contained in:
Sam Atkins 2024-04-21 19:08:47 +01:00 committed by Andreas Kling
parent efce563abd
commit 59c79e848c
Notes: sideshowbarker 2024-07-17 04:03:27 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/59c79e848c
Pull-request: https://github.com/SerenityOS/serenity/pull/24062
Reviewed-by: https://github.com/Hendiadyoin1
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2137,11 +2137,12 @@ Optional<Gfx::UnicodeRange> Parser::parse_unicode_range(StringView text)
return make_valid_unicode_range(start_value, end_value);
}
RefPtr<StyleValue> Parser::parse_dimension_value(ComponentValue const& component_value)
RefPtr<StyleValue> Parser::parse_dimension_value(TokenStream<ComponentValue>& tokens)
{
auto dimension = parse_dimension(component_value);
auto dimension = parse_dimension(tokens.peek_token());
if (!dimension.has_value())
return nullptr;
(void)tokens.next_token(); // dimension
if (dimension->is_angle())
return AngleStyleValue::create(dimension->angle());
@ -5155,7 +5156,9 @@ RefPtr<StyleValue> Parser::parse_transform_value(TokenStream<ComponentValue>& to
} else 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);
// FIXME: Remove this reconsume once all parsing functions are TokenStream-based.
argument_tokens.reconsume_current_input_token();
auto dimension_value = parse_dimension_value(argument_tokens);
if (!dimension_value || !dimension_value->is_angle())
return nullptr;
values.append(dimension_value.release_nonnull());
@ -5168,10 +5171,11 @@ RefPtr<StyleValue> Parser::parse_transform_value(TokenStream<ComponentValue>& to
(void)argument_tokens.next_token(); // calc()
values.append(maybe_calc_value.release_nonnull());
} else {
// FIXME: Remove this reconsume once all parsing functions are TokenStream-based.
argument_tokens.reconsume_current_input_token();
if (function_metadata.parameters[argument_index].type == TransformFunctionParameterType::LengthNone) {
auto ident_transaction = argument_tokens.begin_transaction();
// FIXME: Remove this reconsume once all parsing functions are TokenStream-based.
argument_tokens.reconsume_current_input_token();
auto identifier_value = parse_identifier_value(argument_tokens);
if (identifier_value && identifier_value->to_identifier() == ValueID::None) {
values.append(identifier_value.release_nonnull());
@ -5180,7 +5184,7 @@ RefPtr<StyleValue> Parser::parse_transform_value(TokenStream<ComponentValue>& to
}
}
auto dimension_value = parse_dimension_value(value);
auto dimension_value = parse_dimension_value(argument_tokens);
if (!dimension_value || !dimension_value->is_length())
return nullptr;
@ -5192,7 +5196,9 @@ RefPtr<StyleValue> Parser::parse_transform_value(TokenStream<ComponentValue>& to
if (maybe_calc_value && maybe_calc_value->resolves_to_length_percentage()) {
values.append(maybe_calc_value.release_nonnull());
} else {
auto dimension_value = parse_dimension_value(value);
// FIXME: Remove this reconsume once all parsing functions are TokenStream-based.
argument_tokens.reconsume_current_input_token();
auto dimension_value = parse_dimension_value(argument_tokens);
if (!dimension_value)
return nullptr;

2
Userland/Libraries/LibWeb/CSS/Parser/Parser.h
View file

@ -219,7 +219,7 @@ private:
// NOTE: Implemented in generated code. (GenerateCSSMathFunctions.cpp)
OwnPtr<CalculationNode> parse_math_function(PropertyID, Function const&);
OwnPtr<CalculationNode> parse_a_calc_function_node(Function const&);
RefPtr<StyleValue> parse_dimension_value(ComponentValue const&);
RefPtr<StyleValue> parse_dimension_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_integer_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_number_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_number_or_percentage_value(TokenStream<ComponentValue>&);