RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:17:45 +00:00
Code Issues Activity Actions

LibWeb: Use a Variant for calc() percentage_basis

Browse source 
Depending on the type of the calc() expression, the percentage_basis has
to be the same dimension type. Several places were already passing `
{}` for this, so let's make that an empty Variant instead of an
undefined Length. :^)
This commit is contained in:
Sam Atkins 2022-02-18 12:07:09 +00:00 • committed by Andreas Kling
parent 8aa1c7f5b0
commit 1093d6e2c3
2 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Userland/Libraries/LibWeb/CSS/StyleValue.cpp
View file

@ -278,17 +278,17 @@ String BoxShadowStyleValue::to_string() const
return builder.to_string(); return builder.to_string();
} }
void CalculatedStyleValue::CalculationResult::add(CalculationResult const& other, Layout::Node const* layout_node, Length const& percentage_basis) void CalculatedStyleValue::CalculationResult::add(CalculationResult const& other, Layout::Node const* layout_node, PercentageBasis const& percentage_basis)
{ {
add_or_subtract_internal(SumOperation::Add, other, layout_node, percentage_basis); add_or_subtract_internal(SumOperation::Add, other, layout_node, percentage_basis);
} }
void CalculatedStyleValue::CalculationResult::subtract(CalculationResult const& other, Layout::Node const* layout_node, Length const& percentage_basis) void CalculatedStyleValue::CalculationResult::subtract(CalculationResult const& other, Layout::Node const* layout_node, PercentageBasis const& percentage_basis)
{ {
add_or_subtract_internal(SumOperation::Subtract, other, layout_node, percentage_basis); add_or_subtract_internal(SumOperation::Subtract, other, layout_node, percentage_basis);
} }
void CalculatedStyleValue::CalculationResult::add_or_subtract_internal(SumOperation op, CalculationResult const& other, Layout::Node const* layout_node, Length const& percentage_basis) void CalculatedStyleValue::CalculationResult::add_or_subtract_internal(SumOperation op, CalculationResult const& other, Layout::Node const* layout_node, PercentageBasis const& percentage_basis)
{ {
// We know from validation when resolving the type, that "both sides have the same type, or that one side is a <number> and the other is an <integer>". // We know from validation when resolving the type, that "both sides have the same type, or that one side is a <number> and the other is an <integer>".
// Though, having the same type may mean that one side is a <dimension> and the other a <percentage>. // Though, having the same type may mean that one side is a <dimension> and the other a <percentage>.
@ -318,9 +318,9 @@ void CalculatedStyleValue::CalculationResult::add_or_subtract_internal(SumOperat
else else
m_value = Length::make_px(this_px - other_px); m_value = Length::make_px(this_px - other_px);
} else { } else {
VERIFY(!percentage_basis.is_undefined()); VERIFY(percentage_basis.has<Length>());
auto other_px = percentage_basis.percentage_of(other.m_value.get<Percentage>()).to_px(*layout_node); auto other_px = percentage_basis.get<Length>().percentage_of(other.m_value.get<Percentage>()).to_px(*layout_node);
if (op == SumOperation::Add) if (op == SumOperation::Add)
m_value = Length::make_px(this_px + other_px); m_value = Length::make_px(this_px + other_px);
else else
@ -712,7 +712,7 @@ Optional<CalculatedStyleValue::ResolvedType> CalculatedStyleValue::CalcNumberVal
[](NonnullOwnPtr<CalcNumberSum> const& sum) { return sum->resolved_type(); }); [](NonnullOwnPtr<CalcNumberSum> const& sum) { return sum->resolved_type(); });
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberValue::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberValue::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
return value.visit( return value.visit(
[&](Number const& number) -> CalculatedStyleValue::CalculationResult { [&](Number const& number) -> CalculatedStyleValue::CalculationResult {
@ -723,7 +723,7 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberValue::r
}); });
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcValue::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcValue::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
return value.visit( return value.visit(
[&](Number const& number) -> CalculatedStyleValue::CalculationResult { [&](Number const& number) -> CalculatedStyleValue::CalculationResult {
@ -740,7 +740,7 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcValue::resolve
}); });
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcSum::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcSum::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
auto value = first_calc_product->resolve(layout_node, percentage_basis); auto value = first_calc_product->resolve(layout_node, percentage_basis);
@ -758,7 +758,7 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcSum::resolve(L
return value; return value;
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberSum::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberSum::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
auto value = first_calc_number_product->resolve(layout_node, percentage_basis); auto value = first_calc_number_product->resolve(layout_node, percentage_basis);
@ -776,7 +776,7 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberSum::res
return value; return value;
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcProduct::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcProduct::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
auto value = first_calc_value.resolve(layout_node, percentage_basis); auto value = first_calc_value.resolve(layout_node, percentage_basis);
@ -799,7 +799,7 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcProduct::resol
return value; return value;
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberProduct::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberProduct::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
auto value = first_calc_number_value.resolve(layout_node, percentage_basis); auto value = first_calc_number_value.resolve(layout_node, percentage_basis);
@ -817,7 +817,7 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberProduct:
return value; return value;
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcProductPartWithOperator::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcProductPartWithOperator::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
return value.visit( return value.visit(
[&](CalcValue const& calc_value) { [&](CalcValue const& calc_value) {
@ -828,17 +828,17 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcProductPartWit
}); });
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcSumPartWithOperator::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcSumPartWithOperator::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
return value->resolve(layout_node, percentage_basis); return value->resolve(layout_node, percentage_basis);
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberProductPartWithOperator::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberProductPartWithOperator::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
return value.resolve(layout_node, percentage_basis); return value.resolve(layout_node, percentage_basis);
} }
CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberSumPartWithOperator::resolve(Layout::Node const* layout_node, Length const& percentage_basis) const CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberSumPartWithOperator::resolve(Layout::Node const* layout_node, PercentageBasis const& percentage_basis) const
{ {
return value->resolve(layout_node, percentage_basis); return value->resolve(layout_node, percentage_basis);
} }

28
Userland/Libraries/LibWeb/CSS/StyleValue.h
View file

@ -691,21 +691,23 @@ public:
float value; float value;
}; };
using PercentageBasis = Variant<Empty, Length>;
class CalculationResult { class CalculationResult {
public: public:
CalculationResult(Variant<Number, Length, Percentage> value) CalculationResult(Variant<Number, Length, Percentage> value)
: m_value(move(value)) : m_value(move(value))
{ {
} }
void add(CalculationResult const& other, Layout::Node const*, Length const& percentage_basis); void add(CalculationResult const& other, Layout::Node const*, PercentageBasis const& percentage_basis);
void subtract(CalculationResult const& other, Layout::Node const*, Length const& percentage_basis); void subtract(CalculationResult const& other, Layout::Node const*, PercentageBasis const& percentage_basis);
void multiply_by(CalculationResult const& other, Layout::Node const*); void multiply_by(CalculationResult const& other, Layout::Node const*);
void divide_by(CalculationResult const& other, Layout::Node const*); void divide_by(CalculationResult const& other, Layout::Node const*);
Variant<Number, Length, Percentage> const& value() const { return m_value; } Variant<Number, Length, Percentage> const& value() const { return m_value; }
private: private:
void add_or_subtract_internal(SumOperation op, CalculationResult const& other, Layout::Node const*, Length const& percentage_basis); void add_or_subtract_internal(SumOperation op, CalculationResult const& other, Layout::Node const*, PercentageBasis const& percentage_basis);
Variant<Number, Length, Percentage> m_value; Variant<Number, Length, Percentage> m_value;
}; };
@ -722,14 +724,14 @@ public:
Variant<Number, NonnullOwnPtr<CalcNumberSum>> value; Variant<Number, NonnullOwnPtr<CalcNumberSum>> value;
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
struct CalcValue { struct CalcValue {
Variant<Number, Length, Percentage, NonnullOwnPtr<CalcSum>> value; Variant<Number, Length, Percentage, NonnullOwnPtr<CalcSum>> value;
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
// This represents that: https://www.w3.org/TR/css-values-3/#calc-syntax // This represents that: https://www.w3.org/TR/css-values-3/#calc-syntax
@ -743,7 +745,7 @@ public:
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
struct CalcNumberSum { struct CalcNumberSum {
@ -756,7 +758,7 @@ public:
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
struct CalcProduct { struct CalcProduct {
@ -765,7 +767,7 @@ public:
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
struct CalcSumPartWithOperator { struct CalcSumPartWithOperator {
@ -778,7 +780,7 @@ public:
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
struct CalcProductPartWithOperator { struct CalcProductPartWithOperator {
@ -787,7 +789,7 @@ public:
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
struct CalcNumberProduct { struct CalcNumberProduct {
@ -796,7 +798,7 @@ public:
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
struct CalcNumberProductPartWithOperator { struct CalcNumberProductPartWithOperator {
@ -805,7 +807,7 @@ public:
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
struct CalcNumberSumPartWithOperator { struct CalcNumberSumPartWithOperator {
@ -818,7 +820,7 @@ public:
String to_string() const; String to_string() const;
Optional<ResolvedType> resolved_type() const; Optional<ResolvedType> resolved_type() const;
CalculationResult resolve(Layout::Node const*, Length const& percentage_basis) const; CalculationResult resolve(Layout::Node const*, PercentageBasis const& percentage_basis) const;
}; };
static NonnullRefPtr<CalculatedStyleValue> create(NonnullOwnPtr<CalcSum> calc_sum, ResolvedType resolved_type) static NonnullRefPtr<CalculatedStyleValue> create(NonnullOwnPtr<CalcSum> calc_sum, ResolvedType resolved_type)