diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 3e85ced585..2eeeca0645 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -3758,13 +3758,13 @@ ErrorOr> Parser::parse_atan2_function(Function const& fu auto node_a_maybe_parameter_type = node_a->resolved_type(); if (!node_a_maybe_parameter_type.has_value()) { - dbgln_if(CSS_PARSER_DEBUG, "Failed to resolve type for atan() parameter 1"sv); + dbgln_if(CSS_PARSER_DEBUG, "Failed to resolve type for atan2() parameter 1"sv); return nullptr; } auto node_b_maybe_parameter_type = node_b->resolved_type(); if (!node_b_maybe_parameter_type.has_value()) { - dbgln_if(CSS_PARSER_DEBUG, "Failed to resolve type for atan() parameter 2"sv); + dbgln_if(CSS_PARSER_DEBUG, "Failed to resolve type for atan2() parameter 2"sv); return nullptr; } @@ -3778,6 +3778,51 @@ ErrorOr> Parser::parse_atan2_function(Function const& fu return TRY(Atan2CalculationNode::create(node_a.release_nonnull(), node_b.release_nonnull())); } +ErrorOr> Parser::parse_pow_function(Function const& function) +{ + TokenStream stream { function.values() }; + auto parameters = parse_a_comma_separated_list_of_component_values(stream); + + if (parameters.size() != 2) { + dbgln_if(CSS_PARSER_DEBUG, "pow() must have exactly two parameters"sv); + return nullptr; + } + + auto node_a = TRY(parse_a_calculation(parameters[0])); + auto node_b = TRY(parse_a_calculation(parameters[1])); + + if (!node_a || !node_b) { + dbgln_if(CSS_PARSER_DEBUG, "pow() parameters must be valid calculations"sv); + return nullptr; + } + + auto node_a_maybe_parameter_type = node_a->resolved_type(); + if (!node_a_maybe_parameter_type.has_value()) { + dbgln_if(CSS_PARSER_DEBUG, "Failed to resolve type for pow() parameter 1"sv); + return nullptr; + } + + auto node_b_maybe_parameter_type = node_b->resolved_type(); + if (!node_b_maybe_parameter_type.has_value()) { + dbgln_if(CSS_PARSER_DEBUG, "Failed to resolve type for pow() parameter 2"sv); + return nullptr; + } + + auto node_a_resolved_type = node_a_maybe_parameter_type.value(); + auto node_b_resolved_type = node_b_maybe_parameter_type.value(); + if (node_a_resolved_type != node_b_resolved_type) { + dbgln_if(CSS_PARSER_DEBUG, "pow() parameters must be of the same type"sv); + return nullptr; + } + + if (node_a_resolved_type != CalculatedStyleValue::ResolvedType::Number) { + dbgln_if(CSS_PARSER_DEBUG, "pow() parameters must be numbers"sv); + return nullptr; + } + + return TRY(PowCalculationNode::create(node_a.release_nonnull(), node_b.release_nonnull())); +} + ErrorOr> Parser::parse_dynamic_value(ComponentValue const& component_value) { if (component_value.is_function()) { @@ -3843,6 +3888,9 @@ ErrorOr> Parser::parse_a_calc_function_node(Function con if (function.name().equals_ignoring_ascii_case("atan2"sv)) return TRY(parse_atan2_function(function)); + if (function.name().equals_ignoring_ascii_case("pow"sv)) + return TRY(parse_pow_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 20c5054430..2419f606c0 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -302,6 +302,7 @@ private: ErrorOr> parse_acos_function(Function const&); ErrorOr> parse_atan_function(Function const&); ErrorOr> parse_atan2_function(Function const&); + ErrorOr> parse_pow_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 7d405e9fa0..39d9901dd5 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp @@ -1237,6 +1237,64 @@ ErrorOr Atan2CalculationNode::dump(StringBuilder& builder, int indent) con return {}; } +ErrorOr> PowCalculationNode::create(NonnullOwnPtr x, NonnullOwnPtr y) +{ + return adopt_nonnull_own_or_enomem(new (nothrow) PowCalculationNode(move(x), move(y))); +} + +PowCalculationNode::PowCalculationNode(NonnullOwnPtr x, NonnullOwnPtr y) + : CalculationNode(Type::Pow) + , m_x(move(x)) + , m_y(move(y)) +{ +} + +PowCalculationNode::~PowCalculationNode() = default; + +ErrorOr PowCalculationNode::to_string() const +{ + StringBuilder builder; + builder.append("pow("sv); + builder.append(TRY(m_x->to_string())); + builder.append(", "sv); + builder.append(TRY(m_y->to_string())); + builder.append(")"sv); + return builder.to_string(); +} + +Optional PowCalculationNode::resolved_type() const +{ + return CalculatedStyleValue::ResolvedType::Number; +} + +CalculatedStyleValue::CalculationResult PowCalculationNode::resolve(Optional context, CalculatedStyleValue::PercentageBasis const& percentage_basis) const +{ + auto node_a = m_x->resolve(context, percentage_basis); + auto node_a_value = resolve_value(node_a.value(), context); + + auto node_b = m_y->resolve(context, percentage_basis); + auto node_b_value = resolve_value(node_b.value(), context); + + auto result = pow(node_a_value, node_b_value); + + return { Number(Number::Type::Number, result) }; +} + +ErrorOr PowCalculationNode::for_each_child_node(Function(NonnullOwnPtr&)> const& callback) +{ + TRY(m_x->for_each_child_node(callback)); + TRY(m_y->for_each_child_node(callback)); + TRY(callback(m_x)); + TRY(callback(m_y)); + return {}; +} + +ErrorOr PowCalculationNode::dump(StringBuilder& builder, int indent) const +{ + TRY(builder.try_appendff("{: >{}}POW: {}\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 22b58bef1a..a8b821a5f5 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h @@ -162,6 +162,14 @@ public: Atan, Atan2, + // Exponential functions, a sub-type of operator node + // https://drafts.csswg.org/css-values-4/#exponent-funcs + Pow, + Sqrt, + Hypot, + Log, + Exp, + // This only exists during parsing. Unparsed, }; @@ -523,4 +531,23 @@ private: NonnullOwnPtr m_x; }; +class PowCalculationNode final : public CalculationNode { +public: + static ErrorOr> create(NonnullOwnPtr, NonnullOwnPtr); + ~PowCalculationNode(); + + virtual ErrorOr to_string() const override; + virtual Optional resolved_type() const override; + virtual bool contains_percentage() const override { return false; }; + 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: + explicit PowCalculationNode(NonnullOwnPtr, NonnullOwnPtr); + NonnullOwnPtr m_x; + NonnullOwnPtr m_y; +}; + }