diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 2eeeca0645..4be59f2e8c 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -3823,6 +3823,27 @@ ErrorOr> Parser::parse_pow_function(Function const& func return TRY(PowCalculationNode::create(node_a.release_nonnull(), node_b.release_nonnull())); } +ErrorOr> Parser::parse_sqrt_function(Function const& function) +{ + auto node = TRY(parse_a_calculation(function.values())); + if (!node) { + dbgln_if(CSS_PARSER_DEBUG, "sqrt() parameter must be valid calculation"sv); + return nullptr; + } + + auto maybe_parameter_type = node->resolved_type(); + if (!maybe_parameter_type.has_value()) { + dbgln_if(CSS_PARSER_DEBUG, "Failed to resolve type for sqrt() parameter"sv); + return nullptr; + } + + auto resolved_type = maybe_parameter_type.value(); + if (resolved_type != CalculatedStyleValue::ResolvedType::Number) + return Error::from_string_view("sqrt() parameter must be number"sv); + + return TRY(SqrtCalculationNode::create(node.release_nonnull())); +} + ErrorOr> Parser::parse_dynamic_value(ComponentValue const& component_value) { if (component_value.is_function()) { @@ -3891,6 +3912,9 @@ ErrorOr> Parser::parse_a_calc_function_node(Function con if (function.name().equals_ignoring_ascii_case("pow"sv)) return TRY(parse_pow_function(function)); + if (function.name().equals_ignoring_ascii_case("sqrt"sv)) + return TRY(parse_sqrt_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 2419f606c0..6eec793496 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -303,6 +303,7 @@ private: ErrorOr> parse_atan_function(Function const&); ErrorOr> parse_atan2_function(Function const&); ErrorOr> parse_pow_function(Function const&); + ErrorOr> parse_sqrt_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 39d9901dd5..35166d698b 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp @@ -1295,6 +1295,55 @@ ErrorOr PowCalculationNode::dump(StringBuilder& builder, int indent) const return {}; } +ErrorOr> SqrtCalculationNode::create(NonnullOwnPtr value) +{ + return adopt_nonnull_own_or_enomem(new (nothrow) SqrtCalculationNode(move(value))); +} + +SqrtCalculationNode::SqrtCalculationNode(NonnullOwnPtr value) + : CalculationNode(Type::Sqrt) + , m_value(move(value)) +{ +} + +SqrtCalculationNode::~SqrtCalculationNode() = default; + +ErrorOr SqrtCalculationNode::to_string() const +{ + StringBuilder builder; + builder.append("sqrt("sv); + builder.append(TRY(m_value->to_string())); + builder.append(")"sv); + return builder.to_string(); +} + +Optional SqrtCalculationNode::resolved_type() const +{ + return CalculatedStyleValue::ResolvedType::Number; +} + +CalculatedStyleValue::CalculationResult SqrtCalculationNode::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 = sqrt(node_a_value); + + return { Number(Number::Type::Number, result) }; +} + +ErrorOr SqrtCalculationNode::for_each_child_node(Function(NonnullOwnPtr&)> const& callback) +{ + TRY(m_value->for_each_child_node(callback)); + TRY(callback(m_value)); + return {}; +} + +ErrorOr SqrtCalculationNode::dump(StringBuilder& builder, int indent) const +{ + TRY(builder.try_appendff("{: >{}}SQRT: {}\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 a8b821a5f5..2c0a8782f4 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h @@ -550,4 +550,22 @@ private: NonnullOwnPtr m_y; }; +class SqrtCalculationNode final : public CalculationNode { +public: + static ErrorOr> create(NonnullOwnPtr); + ~SqrtCalculationNode(); + + 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: + SqrtCalculationNode(NonnullOwnPtr); + NonnullOwnPtr m_value; +}; + }