mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-12-07 21:59:54 +00:00
LibWeb: Properly simplify sum nodes containing negated sum nodes
This is ad-hoc, see https://github.com/w3c/csswg-drafts/issues/13020 Gains us 5 WPT tests
This commit is contained in:
Callum Law
Sam Atkins
parent
9c06d58b2e
commit
c2ca712406
Notes:
github-actions[bot]
2025-10-30 12:19:35 +00:00
Author: https://github.com/Calme1709
Commit: c2ca712406
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/6612
Reviewed-by: https://github.com/AtkinsSJ ✅
3 changed files with 120 additions and 0 deletions
|
|
@ -3070,6 +3070,22 @@ NonnullRefPtr<CalculationNode const> simplify_a_calculation_tree(CalculationNode
|
||||||
if (child.type() == CalculationNode::Type::Negate)
|
if (child.type() == CalculationNode::Type::Negate)
|
||||||
return as<NegateCalculationNode>(child).child();
|
return as<NegateCalculationNode>(child).child();
|
||||||
|
|
||||||
|
// AD-HOC: Convert negated sums into sums of negated nodes - see https://github.com/w3c/csswg-drafts/issues/13020
|
||||||
|
if (child.type() == CalculationNode::Type::Sum) {
|
||||||
|
Vector<NonnullRefPtr<CalculationNode const>> negated_sum_components;
|
||||||
|
|
||||||
|
for (auto const& sum_child : child.children()) {
|
||||||
|
if (sum_child->type() == CalculationNode::Type::Numeric)
|
||||||
|
negated_sum_components.append(as<NumericCalculationNode>(*sum_child).negated(context));
|
||||||
|
else if (sum_child->type() == CalculationNode::Type::Negate)
|
||||||
|
negated_sum_components.append(as<NegateCalculationNode>(*sum_child).child());
|
||||||
|
else
|
||||||
|
negated_sum_components.append(NegateCalculationNode::create(sum_child));
|
||||||
|
}
|
||||||
|
|
||||||
|
return SumCalculationNode::create(negated_sum_components);
|
||||||
|
}
|
||||||
|
|
||||||
// 3. Return root.
|
// 3. Return root.
|
||||||
// NOTE: Because our root is immutable, we have to return a new node if the child was modified.
|
// NOTE: Because our root is immutable, we have to return a new node if the child was modified.
|
||||||
if (&child == &root_negate.child())
|
if (&child == &root_negate.child())
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
Harness status: OK
|
||||||
|
|
||||||
|
Found 11 tests
|
||||||
|
|
||||||
|
11 Pass
|
||||||
|
Pass testing calc(20px + calc(80px))
|
||||||
|
Pass testing calc(calc(100px))
|
||||||
|
Pass testing calc(calc(2) * calc(50px)
|
||||||
|
Pass testing calc(calc(150px*2/3)
|
||||||
|
Pass testing calc(calc(2 * calc(calc(3)) + 4) * 10px)
|
||||||
|
Pass testing calc(50px + calc(40%))
|
||||||
|
Pass testing calc(calc(300px - 1 * (0% + 100px)))
|
||||||
|
Pass testing calc(calc(300px - (0% + 100px) * 1))
|
||||||
|
Pass testing calc(calc(300px - (0% + 100px) * -1))
|
||||||
|
Pass testing calc(calc(300px - -1 * (0% + 100px)))
|
||||||
|
Pass testing calc(calc(300px - 1 * (0% - 100px)))
|
||||||
|
|
@ -0,0 +1,88 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
|
||||||
|
<title>CSS Values and Units Test: serialization of summation involving nested calc()</title>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
|
||||||
|
This test is an adapted version of the portion of the original test
|
||||||
|
|
||||||
|
https://chromium.googlesource.com/chromium/src/+/c825d655f6aaf73484f9d56e9012793f5b9668cc/third_party/WebKit/LayoutTests/css3/calc/calc-nesting.html
|
||||||
|
|
||||||
|
which required using property-parsing-test.js
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
|
||||||
|
<link rel="help" href="https://www.w3.org/TR/css-values-4/#math-function-simplify-an-expression">
|
||||||
|
|
||||||
|
<meta content="This test checks that how a summation involving one or more nested calc() is performed and serialized." name="assert">
|
||||||
|
|
||||||
|
<script src="../../resources/testharness.js"></script>
|
||||||
|
|
||||||
|
<script src="../../resources/testharnessreport.js"></script>
|
||||||
|
|
||||||
|
<div id="target"></div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
function startTesting()
|
||||||
|
{
|
||||||
|
|
||||||
|
var targetElement = document.getElementById("target");
|
||||||
|
|
||||||
|
function verifySerialization(specified_value, serialization_expected, description)
|
||||||
|
{
|
||||||
|
|
||||||
|
test(function()
|
||||||
|
{
|
||||||
|
|
||||||
|
targetElement.style.left = specified_value;
|
||||||
|
|
||||||
|
assert_equals(targetElement.style.left, serialization_expected);
|
||||||
|
|
||||||
|
}, description);
|
||||||
|
}
|
||||||
|
|
||||||
|
verifySerialization("calc(20px + calc(80px))", "calc(100px)", "testing calc(20px + calc(80px))");
|
||||||
|
|
||||||
|
verifySerialization("calc(calc(100px))", "calc(100px)", "testing calc(calc(100px))");
|
||||||
|
|
||||||
|
verifySerialization("calc(calc(2) * calc(50px)", "calc(100px)", "testing calc(calc(2) * calc(50px)");
|
||||||
|
|
||||||
|
verifySerialization("calc(calc(150px*2/3)", "calc(100px)", "testing calc(calc(150px*2/3)");
|
||||||
|
|
||||||
|
verifySerialization("calc(calc(2 * calc(calc(3)) + 4) * 10px)", "calc(100px)", "testing calc(calc(2 * calc(calc(3)) + 4) * 10px)");
|
||||||
|
|
||||||
|
verifySerialization("calc(50px + calc(40%))", "calc(40% + 50px)", "testing calc(50px + calc(40%))");
|
||||||
|
|
||||||
|
verifySerialization("calc(calc(300px - 1 * (0% + 100px)))", "calc(0% + 200px)", "testing calc(calc(300px - 1 * (0% + 100px)))");
|
||||||
|
|
||||||
|
verifySerialization("calc(calc(300px - (0% + 100px) * 1))", "calc(0% + 200px)", "testing calc(calc(300px - (0% + 100px) * 1))");
|
||||||
|
|
||||||
|
verifySerialization("calc(calc(300px - (0% + 100px) * -1))", "calc(0% + 400px)", "testing calc(calc(300px - (0% + 100px) * -1))");
|
||||||
|
|
||||||
|
verifySerialization("calc(calc(300px - -1 * (0% + 100px)))", "calc(0% + 400px)", "testing calc(calc(300px - -1 * (0% + 100px)))");
|
||||||
|
|
||||||
|
verifySerialization("calc(calc(300px - 1 * (0% - 100px)))", "calc(0% + 400px)", "testing calc(calc(300px - 1 * (0% - 100px)))");
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
"
|
||||||
|
Sort the terms in the following order:
|
||||||
|
|
||||||
|
The number, if present
|
||||||
|
|
||||||
|
The percentage, if present
|
||||||
|
|
||||||
|
The dimensions, ordered by their units ASCII case-insensitive alphabetically
|
||||||
|
"
|
||||||
|
https://www.w3.org/TR/css-values-4/#math-function-serialize-a-summation
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
startTesting();
|
||||||
|
|
||||||
|
</script>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue