mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-29 20:29:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/CSS: Parse gradient functions with TokenStream

Browse source 
They already used TokenStream for parsing the function parameters, but
this makes the `parse_foo_gradient()` functions themselves take a
TokenStream.
This commit is contained in:
Sam Atkins 2024-08-09 13:56:17 +01:00 • committed by Andreas Kling
commit 9de73bf89b
Notes: github-actions[bot] 2024-08-10 08:38:51 +00:00
3 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibWeb/CSS/Parser/GradientParsing.cpp
View file

@ -135,10 +135,13 @@ Optional<Vector<AngularColorStopListElement>> Parser::parse_angular_color_stop_l
[](Dimension& dimension) { return dimension.angle_percentage(); });
}
RefPtr<StyleValue> Parser::parse_linear_gradient_function(ComponentValue const& component_value)
RefPtr<StyleValue> Parser::parse_linear_gradient_function(TokenStream<ComponentValue>& outer_tokens)
{
using GradientType = LinearGradientStyleValue::GradientType;
auto transaction = outer_tokens.begin_transaction();
auto& component_value = outer_tokens.next_token();
if (!component_value.is_function())
return nullptr;
@ -260,11 +263,15 @@ RefPtr<StyleValue> Parser::parse_linear_gradient_function(ComponentValue const&
if (!color_stops.has_value())
return nullptr;
transaction.commit();
return LinearGradientStyleValue::create(gradient_direction, move(*color_stops), gradient_type, repeating_gradient);
}
RefPtr<StyleValue> Parser::parse_conic_gradient_function(ComponentValue const& component_value)
RefPtr<StyleValue> Parser::parse_conic_gradient_function(TokenStream<ComponentValue>& outer_tokens)
{
auto transaction = outer_tokens.begin_transaction();
auto& component_value = outer_tokens.next_token();
if (!component_value.is_function())
return nullptr;
@ -360,10 +367,11 @@ RefPtr<StyleValue> Parser::parse_conic_gradient_function(ComponentValue const& c
if (!at_position)
at_position = PositionStyleValue::create_center();
transaction.commit();
return ConicGradientStyleValue::create(from_angle, at_position.release_nonnull(), move(*color_stops), repeating_gradient);
}
RefPtr<StyleValue> Parser::parse_radial_gradient_function(ComponentValue const& component_value)
RefPtr<StyleValue> Parser::parse_radial_gradient_function(TokenStream<ComponentValue>& outer_tokens)
{
using EndingShape = RadialGradientStyleValue::EndingShape;
using Extent = RadialGradientStyleValue::Extent;
@ -371,6 +379,9 @@ RefPtr<StyleValue> Parser::parse_radial_gradient_function(ComponentValue const&
using EllipseSize = RadialGradientStyleValue::EllipseSize;
using Size = RadialGradientStyleValue::Size;
auto transaction = outer_tokens.begin_transaction();
auto& component_value = outer_tokens.next_token();
if (!component_value.is_function())
return nullptr;
@ -511,6 +522,7 @@ RefPtr<StyleValue> Parser::parse_radial_gradient_function(ComponentValue const&
if (!at_position)
at_position = PositionStyleValue::create_center();
transaction.commit();
return RadialGradientStyleValue::create(ending_shape, size, at_position.release_nonnull(), move(*color_stops), repeating_gradient);
}

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

@ -3199,26 +3199,18 @@ RefPtr<StyleValue> Parser::parse_string_value(TokenStream<ComponentValue>& token
RefPtr<StyleValue> Parser::parse_image_value(TokenStream<ComponentValue>& tokens)
{
auto transaction = tokens.begin_transaction();
if (auto url = parse_url_function(tokens); url.has_value()) {
transaction.commit();
if (auto url = parse_url_function(tokens); url.has_value())
return ImageStyleValue::create(url.value());
}
auto& token = tokens.next_token();
if (auto linear_gradient = parse_linear_gradient_function(token)) {
transaction.commit();
if (auto linear_gradient = parse_linear_gradient_function(tokens))
return linear_gradient;
}
if (auto conic_gradient = parse_conic_gradient_function(token)) {
transaction.commit();
if (auto conic_gradient = parse_conic_gradient_function(tokens))
return conic_gradient;
}
if (auto radial_gradient = parse_radial_gradient_function(token)) {
transaction.commit();
if (auto radial_gradient = parse_radial_gradient_function(tokens))
return radial_gradient;
}
return nullptr;
}

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

@ -271,9 +271,9 @@ private:
Optional<Vector<LinearColorStopListElement>> parse_linear_color_stop_list(TokenStream<ComponentValue>&);
Optional<Vector<AngularColorStopListElement>> parse_angular_color_stop_list(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_linear_gradient_function(ComponentValue const&);
RefPtr<StyleValue> parse_conic_gradient_function(ComponentValue const&);
RefPtr<StyleValue> parse_radial_gradient_function(ComponentValue const&);
RefPtr<StyleValue> parse_linear_gradient_function(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_conic_gradient_function(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_radial_gradient_function(TokenStream<ComponentValue>&);
ParseErrorOr<NonnullRefPtr<StyleValue>> parse_css_value(PropertyID, TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_css_value_for_property(PropertyID, TokenStream<ComponentValue>&);