fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-01-03 23:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb/CSS: Don't multiply non-canonical dimensions in calc()

Browse Source 
This fixes the layout of tweakers.net, which regressed when calc
simplification was added in ee712bd98f.
This commit is contained in:
Sam Atkins
2025-01-31 10:55:58 +00:00
committed by Alexander Kalenik
parent 6701aaf1cd
commit d15e1eb9f6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp
View File

@@ -2486,7 +2486,7 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalculationResult:
// If we don't have a context, we cant resolve the length, so return NAN // If we don't have a context, we cant resolve the length, so return NAN
if (!context.length_resolution_context.has_value()) { if (!context.length_resolution_context.has_value()) {
dbgln("Failed to resolve length, likely due to calc() being used with relative units and a property not taking it into account"); dbgln("Failed to resolve length `{}`, likely due to calc() being used with relative units and a property not taking it into account", length.to_string());
return AK::NaN<double>; return AK::NaN<double>;
} }
@@ -3091,8 +3091,10 @@ NonnullRefPtr<CalculationNode> simplify_a_calculation_tree(CalculationNode const
// FIXME: The spec doesn't handle unresolved percentages here, but if we don't exit when we see one, // FIXME: The spec doesn't handle unresolved percentages here, but if we don't exit when we see one,
// we'll get a wrongly-typed value after multiplying the types. // we'll get a wrongly-typed value after multiplying the types.
// Same goes for other numerics with non-canonical units.
// Spec bug: https://github.com/w3c/csswg-drafts/issues/11588 // Spec bug: https://github.com/w3c/csswg-drafts/issues/11588
if (numeric_child.value().has<Percentage>() && context.percentages_resolve_as.has_value()) { if ((numeric_child.value().has<Percentage>() && context.percentages_resolve_as.has_value())
|| !numeric_child.is_in_canonical_unit()) {
is_valid = false; is_valid = false;
break; break;
} }