diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 643c9d9c6d..308c1b7e1c 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -3940,6 +3940,29 @@ ErrorOr> Parser::parse_log_function(Function const& func return TRY(LogCalculationNode::create(node_a.release_nonnull(), node_b.release_nonnull())); } +ErrorOr> Parser::parse_exp_function(Function const& function) +{ + auto node_a = TRY(parse_a_calculation(function.values())); + if (!node_a) { + dbgln_if(CSS_PARSER_DEBUG, "exp() parameter must be valid calculation"sv); + return nullptr; + } + + auto maybe_parameter_type = node_a->resolved_type(); + if (!maybe_parameter_type.has_value()) { + dbgln_if(CSS_PARSER_DEBUG, "Failed to resolve type for exp() parameter"sv); + return nullptr; + } + + auto resolved_type = maybe_parameter_type.value(); + if (resolved_type != CalculatedStyleValue::ResolvedType::Number) { + dbgln_if(CSS_PARSER_DEBUG, "exp() parameter must be number"sv); + return nullptr; + } + + return TRY(ExpCalculationNode::create(node_a.release_nonnull())); +} + ErrorOr> Parser::parse_dynamic_value(ComponentValue const& component_value) { if (component_value.is_function()) { @@ -4017,6 +4040,9 @@ ErrorOr> Parser::parse_a_calc_function_node(Function con if (function.name().equals_ignoring_ascii_case("log"sv)) return TRY(parse_log_function(function)); + if (function.name().equals_ignoring_ascii_case("exp"sv)) + return TRY(parse_exp_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 839e74c81b..84866917cc 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -306,6 +306,7 @@ private: ErrorOr> parse_sqrt_function(Function const&); ErrorOr> parse_hypot_function(Function const&); ErrorOr> parse_log_function(Function const&); + ErrorOr> parse_exp_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 cbab4dd50f..822cff80ae 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp @@ -1478,6 +1478,55 @@ ErrorOr LogCalculationNode::dump(StringBuilder& builder, int indent) const return {}; } +ErrorOr> ExpCalculationNode::create(NonnullOwnPtr value) +{ + return adopt_nonnull_own_or_enomem(new (nothrow) ExpCalculationNode(move(value))); +} + +ExpCalculationNode::ExpCalculationNode(NonnullOwnPtr value) + : CalculationNode(Type::Exp) + , m_value(move(value)) +{ +} + +ExpCalculationNode::~ExpCalculationNode() = default; + +ErrorOr ExpCalculationNode::to_string() const +{ + StringBuilder builder; + builder.append("exp("sv); + builder.append(TRY(m_value->to_string())); + builder.append(")"sv); + return builder.to_string(); +} + +Optional ExpCalculationNode::resolved_type() const +{ + return CalculatedStyleValue::ResolvedType::Number; +} + +CalculatedStyleValue::CalculationResult ExpCalculationNode::resolve(Optional context, CalculatedStyleValue::PercentageBasis const& percentage_basis) const +{ + auto node_a = m_value->resolve(context, percentage_basis); + auto node_a_value = resolve_value(node_a.value(), context); + auto result = exp(node_a_value); + + return { Number(Number::Type::Number, result) }; +} + +ErrorOr ExpCalculationNode::for_each_child_node(Function(NonnullOwnPtr&)> const& callback) +{ + TRY(m_value->for_each_child_node(callback)); + TRY(callback(m_value)); + return {}; +} + +ErrorOr ExpCalculationNode::dump(StringBuilder& builder, int indent) const +{ + TRY(builder.try_appendff("{: >{}}EXP: {}\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 86c9d2027b..9c3f59a474 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h @@ -605,4 +605,22 @@ private: NonnullOwnPtr m_y; }; +class ExpCalculationNode final : public CalculationNode { +public: + static ErrorOr> create(NonnullOwnPtr); + ~ExpCalculationNode(); + + 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: + ExpCalculationNode(NonnullOwnPtr); + NonnullOwnPtr m_value; +}; + }