diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 88c57396ce..643c9d9c6d 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -3891,6 +3891,55 @@ ErrorOr> Parser::parse_hypot_function(Function const& fu return TRY(HypotCalculationNode::create(move(calculated_parameters))); } +ErrorOr> Parser::parse_log_function(Function const& function) +{ + TokenStream stream { function.values() }; + auto parameters = parse_a_comma_separated_list_of_component_values(stream); + + OwnPtr node_b; + if (parameters.size() == 1) { + node_b = TRY(ConstantCalculationNode::create(CalculationNode::ConstantType::E)); + } else if (parameters.size() == 2) { + node_b = TRY(parse_a_calculation(parameters[1])); + } else { + dbgln_if(CSS_PARSER_DEBUG, "log() must have exactly one or two parameters"sv); + return nullptr; + } + + auto node_a = TRY(parse_a_calculation(parameters[0])); + + if (!node_a || !node_b) { + dbgln_if(CSS_PARSER_DEBUG, "log() 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 log() 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 log() 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, "log() parameters must be of the same type"sv); + return nullptr; + } + + if (node_a_resolved_type != CalculatedStyleValue::ResolvedType::Number) { + dbgln_if(CSS_PARSER_DEBUG, "log() parameters must be numbers"sv); + return nullptr; + } + + return TRY(LogCalculationNode::create(node_a.release_nonnull(), node_b.release_nonnull())); +} + ErrorOr> Parser::parse_dynamic_value(ComponentValue const& component_value) { if (component_value.is_function()) { @@ -3965,6 +4014,9 @@ ErrorOr> Parser::parse_a_calc_function_node(Function con if (function.name().equals_ignoring_ascii_case("hypot"sv)) return TRY(parse_hypot_function(function)); + if (function.name().equals_ignoring_ascii_case("log"sv)) + return TRY(parse_log_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 d5d0a93588..839e74c81b 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -305,6 +305,7 @@ private: ErrorOr> parse_pow_function(Function const&); ErrorOr> parse_sqrt_function(Function const&); ErrorOr> parse_hypot_function(Function const&); + ErrorOr> parse_log_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 864c0ad6e0..cbab4dd50f 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp @@ -1420,6 +1420,64 @@ ErrorOr HypotCalculationNode::dump(StringBuilder& builder, int indent) con return {}; } +ErrorOr> LogCalculationNode::create(NonnullOwnPtr x, NonnullOwnPtr y) +{ + return adopt_nonnull_own_or_enomem(new (nothrow) LogCalculationNode(move(x), move(y))); +} + +LogCalculationNode::LogCalculationNode(NonnullOwnPtr x, NonnullOwnPtr y) + : CalculationNode(Type::Log) + , m_x(move(x)) + , m_y(move(y)) +{ +} + +LogCalculationNode::~LogCalculationNode() = default; + +ErrorOr LogCalculationNode::to_string() const +{ + StringBuilder builder; + builder.append("log("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 LogCalculationNode::resolved_type() const +{ + return CalculatedStyleValue::ResolvedType::Number; +} + +CalculatedStyleValue::CalculationResult LogCalculationNode::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 = log2(node_a_value) / log2(node_b_value); + + return { Number(Number::Type::Number, result) }; +} + +ErrorOr LogCalculationNode::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 LogCalculationNode::dump(StringBuilder& builder, int indent) const +{ + TRY(builder.try_appendff("{: >{}}LOG: {}\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 151b47d20e..86c9d2027b 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h @@ -586,4 +586,23 @@ private: Vector> m_values; }; +class LogCalculationNode final : public CalculationNode { +public: + static ErrorOr> create(NonnullOwnPtr, NonnullOwnPtr); + ~LogCalculationNode(); + + 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: + LogCalculationNode(NonnullOwnPtr, NonnullOwnPtr); + NonnullOwnPtr m_x; + NonnullOwnPtr m_y; +}; + }