mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-23 17:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/CSS: Resolve percentages against values in their canonical unit

Browse source
This commit is contained in:
InvalidUsernameException 2025-09-05 16:22:17 +02:00 • committed by Sam Atkins
commit 7afcf305b2
Notes: github-actions[bot] 2025-09-07 14:56:31 +00:00
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp
View file

@ -3214,19 +3214,19 @@ NonnullRefPtr<CalculationNode const> simplify_a_calculation_tree(CalculationNode
[&](Angle const& angle) -> RefPtr<NumericCalculationNode const> { [&](Angle const& angle) -> RefPtr<NumericCalculationNode const> {
VERIFY(context.percentages_resolve_as == ValueType::Angle); VERIFY(context.percentages_resolve_as == ValueType::Angle);
if (angle.type() == Angle::Type::Deg) if (angle.type() == Angle::Type::Deg)
return nullptr; return NumericCalculationNode::create(angle.percentage_of(*percentage), context);
return NumericCalculationNode::create(Angle::make_degrees(angle.to_degrees()).percentage_of(*percentage), context); return NumericCalculationNode::create(Angle::make_degrees(angle.to_degrees()).percentage_of(*percentage), context);
}, },
[&](Frequency const& frequency) -> RefPtr<NumericCalculationNode const> { [&](Frequency const& frequency) -> RefPtr<NumericCalculationNode const> {
VERIFY(context.percentages_resolve_as == ValueType::Frequency); VERIFY(context.percentages_resolve_as == ValueType::Frequency);
if (frequency.type() == Frequency::Type::Hz) if (frequency.type() == Frequency::Type::Hz)
return nullptr; return NumericCalculationNode::create(frequency.percentage_of(*percentage), context);
return NumericCalculationNode::create(Frequency::make_hertz(frequency.to_hertz()).percentage_of(*percentage), context); return NumericCalculationNode::create(Frequency::make_hertz(frequency.to_hertz()).percentage_of(*percentage), context);
}, },
[&](Length const& length) -> RefPtr<NumericCalculationNode const> { [&](Length const& length) -> RefPtr<NumericCalculationNode const> {
VERIFY(context.percentages_resolve_as == ValueType::Length); VERIFY(context.percentages_resolve_as == ValueType::Length);
if (length.type() == Length::Type::Px) if (length.type() == Length::Type::Px)
return nullptr; return NumericCalculationNode::create(length.percentage_of(*percentage), context);
if (length.is_absolute()) if (length.is_absolute())
return NumericCalculationNode::create(Length::make_px(length.absolute_length_to_px()).percentage_of(*percentage), context); return NumericCalculationNode::create(Length::make_px(length.absolute_length_to_px()).percentage_of(*percentage), context);
if (resolution_context.length_resolution_context.has_value()) if (resolution_context.length_resolution_context.has_value())
@ -3236,7 +3236,7 @@ NonnullRefPtr<CalculationNode const> simplify_a_calculation_tree(CalculationNode
[&](Time const& time) -> RefPtr<NumericCalculationNode const> { [&](Time const& time) -> RefPtr<NumericCalculationNode const> {
VERIFY(context.percentages_resolve_as == ValueType::Time); VERIFY(context.percentages_resolve_as == ValueType::Time);
if (time.type() == Time::Type::S) if (time.type() == Time::Type::S)
return nullptr; return NumericCalculationNode::create(time.percentage_of(*percentage), context);
return NumericCalculationNode::create(Time::make_seconds(time.to_seconds()).percentage_of(*percentage), context); return NumericCalculationNode::create(Time::make_seconds(time.to_seconds()).percentage_of(*percentage), context);
}); });