diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 07b31496ef..66c3107e8e 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -3570,6 +3570,18 @@ ErrorOr> Parser::parse_clamp_function(Function const& fu return TRY(ClampCalculationNode::create(move(calculated_parameters[0]), move(calculated_parameters[1]), move(calculated_parameters[2]))); } +ErrorOr> Parser::parse_abs_function(Function const& function) +{ + auto calculation_node = TRY(parse_a_calculation(function.values())); + + if (!calculation_node) { + dbgln_if(CSS_PARSER_DEBUG, "abs() parameter must be a valid calculation"sv); + return nullptr; + } + + return TRY(AbsCalculationNode::create(calculation_node.release_nonnull())); +} + ErrorOr> Parser::parse_dynamic_value(ComponentValue const& component_value) { if (component_value.is_function()) { @@ -3608,6 +3620,9 @@ ErrorOr> Parser::parse_a_calc_function_node(Function con if (function.name().equals_ignoring_ascii_case("clamp"sv)) return TRY(parse_clamp_function(function)); + if (function.name().equals_ignoring_ascii_case("abs"sv)) + return TRY(parse_abs_function(function)); + dbgln_if(CSS_PARSER_DEBUG, "We didn't implement `{}` function yet", function.name()); return nullptr; } diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h index c696de0be1..cfb52c68bc 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -293,6 +293,7 @@ private: ErrorOr> parse_min_function(Function const&); ErrorOr> parse_max_function(Function const&); ErrorOr> parse_clamp_function(Function const&); + ErrorOr> parse_abs_function(Function const&); ErrorOr> parse_dimension_value(ComponentValue const&); ErrorOr> parse_integer_value(TokenStream&); ErrorOr> parse_number_value(TokenStream&); diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp index 09d524c4bb..0c2afb775c 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp @@ -35,6 +35,28 @@ static double resolve_value(CalculatedStyleValue::CalculationResult::Value value [](Time const& time) { return time.to_seconds(); }); }; +static CalculatedStyleValue::CalculationResult to_resolved_type(CalculatedStyleValue::ResolvedType type, double value) +{ + switch (type) { + case CalculatedStyleValue::ResolvedType::Integer: + return { Number(Number::Type::Integer, value) }; + case CalculatedStyleValue::ResolvedType::Number: + return { Number(Number::Type::Number, value) }; + case CalculatedStyleValue::ResolvedType::Angle: + return { Angle::make_degrees(value) }; + case CalculatedStyleValue::ResolvedType::Frequency: + return { Frequency::make_hertz(value) }; + case CalculatedStyleValue::ResolvedType::Length: + return { Length::make_px(value) }; + case CalculatedStyleValue::ResolvedType::Percentage: + return { Percentage(value) }; + case CalculatedStyleValue::ResolvedType::Time: + return { Time::make_seconds(value) }; + } + + VERIFY_NOT_REACHED(); +}; + CalculationNode::CalculationNode(Type type) : m_type(type) { @@ -639,6 +661,63 @@ ErrorOr ClampCalculationNode::dump(StringBuilder& builder, int indent) con return {}; } +ErrorOr> AbsCalculationNode::create(NonnullOwnPtr value) +{ + return adopt_nonnull_own_or_enomem(new (nothrow) AbsCalculationNode(move(value))); +} + +AbsCalculationNode::AbsCalculationNode(NonnullOwnPtr value) + : CalculationNode(Type::Abs) + , m_value(move(value)) +{ +} + +AbsCalculationNode::~AbsCalculationNode() = default; + +ErrorOr AbsCalculationNode::to_string() const +{ + StringBuilder builder; + builder.append("abs("sv); + builder.append(TRY(m_value->to_string())); + builder.append(")"sv); + return builder.to_string(); +} + +Optional AbsCalculationNode::resolved_type() const +{ + return m_value->resolved_type(); +} + +bool AbsCalculationNode::contains_percentage() const +{ + return m_value->contains_percentage(); +} + +CalculatedStyleValue::CalculationResult AbsCalculationNode::resolve(Optional context, CalculatedStyleValue::PercentageBasis const& percentage_basis) const +{ + auto resolved_type = m_value->resolved_type().value(); + auto node_a = m_value->resolve(context, percentage_basis); + auto node_a_value = resolve_value(node_a.value(), context); + + if (node_a_value < 0) + return to_resolved_type(resolved_type, -node_a_value); + + return node_a; +} + +ErrorOr AbsCalculationNode::for_each_child_node(Function(NonnullOwnPtr&)> const& callback) +{ + TRY(m_value->for_each_child_node(callback)); + TRY(callback(m_value)); + return {}; +} + +ErrorOr AbsCalculationNode::dump(StringBuilder& builder, int indent) const +{ + TRY(builder.try_appendff("{: >{}}ABS: {}\n", "", indent, TRY(to_string()))); + return {}; +} + void CalculatedStyleValue::CalculationResult::add(CalculationResult const& other, Optional context, PercentageBasis const& percentage_basis) { add_or_subtract_internal(SumOperation::Add, other, context, percentage_basis); diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h index d053f196de..4111b320e2 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h @@ -133,6 +133,11 @@ public: Negate, Invert, + // Sign-Related Functions, a sub-type of operator node + // https://drafts.csswg.org/css-values-4/#sign-funcs + Abs, + Sign, + // This only exists during parsing. Unparsed, }; @@ -313,4 +318,22 @@ private: NonnullOwnPtr m_max_value; }; +class AbsCalculationNode final : public CalculationNode { +public: + static ErrorOr> create(NonnullOwnPtr); + ~AbsCalculationNode(); + + virtual ErrorOr to_string() const override; + virtual Optional resolved_type() const override; + virtual bool contains_percentage() const override; + virtual CalculatedStyleValue::CalculationResult resolve(Optional, CalculatedStyleValue::PercentageBasis const&) const override; + virtual ErrorOr for_each_child_node(Function(NonnullOwnPtr&)> const&) override; + + virtual ErrorOr dump(StringBuilder&, int indent) const override; + +private: + AbsCalculationNode(NonnullOwnPtr); + NonnullOwnPtr m_value; +}; + }