diff options
Diffstat (limited to 'tests/wpt/tests/css/css-values')
5 files changed, 20 insertions, 13 deletions
diff --git a/tests/wpt/tests/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html b/tests/wpt/tests/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html index c3de4d7ab9e..0b2a60cde7f 100644 --- a/tests/wpt/tests/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html +++ b/tests/wpt/tests/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html @@ -40,7 +40,7 @@ var TESTS = [ start: "auto", end: "calc-size(any, 0px)", expected: { - 0.75: "calc-size(auto, 0px + 0.25 * size)", + 0.75: "calc-size(auto, 0px + (0.25 * size))", }, }, { @@ -48,7 +48,7 @@ var TESTS = [ start: "0px", end: "calc-size(calc-size(min-content, size + 20px), 2 * size)", expected: { - 0.75: "calc-size(calc-size(min-content, 20px + size), 0px + 0.75 * 2 * size)", + 0.75: "calc-size(calc-size(min-content, 20px + size), 0px + (1.5 * size))", }, }, { @@ -56,7 +56,7 @@ var TESTS = [ start: "calc-size(min-content, size * 4)", end: "calc-size(calc-size(min-content, size + 20px), 2 * size)", expected: { - 0.75: "calc-size(min-content, 0.25 * 4 * size + 0.75 * 2 * (20px + size))", + 0.75: "calc-size(min-content, size + (1.5 * (20px + size)))", }, }, { @@ -87,10 +87,10 @@ var TESTS = [ { property: "width", start: "calc-size(fit-content, 20px)", - end: "calc-size(calc-size(fit-content, 3 * size + 10px), min(size + 20px, 2 * size - 30px) + 2 * size + 80px)", + end: "calc-size(calc-size(fit-content, 3 * size + 10px), min(size + 20px, 2 * size - 30px) + ((2 * size) + 80px))", expected: { - 0.75: "calc-size(fit-content, 5px + min(30px + 3 * size, 30px + 2 * 0.75 * (3 * size + 10px)) + 0.75 * 2 * (10px + 3 * size))", - 0.75: "calc-size(fit-content, 5px + 0.75 * (80px + min(10px + 20px + 3 * size, -30px + 2 * (10px + 3 * size)) + 2 * (10px + 3 * size)))", + 0.75: "calc-size(fit-content, 5px + min(30px + (3 * size), 30px + (2 * 0.75 * (3 * size + 10px)) + (0.75 * 2 * (10px + (3 * size)))))", + 0.75: "calc-size(fit-content, 5px + (0.75 * (80px + min(30px + (3 * size), -30px + (2 * (10px + (3 * size)))) + (2 * (10px + (3 * size))))))", }, }, { @@ -98,7 +98,7 @@ var TESTS = [ start: "calc-size(50%, size)", end: "calc-size(calc-size(45%, (2 * size)), size + 20px)", expected: { - 0.75: "calc-size(100%, 0.25 * 0.5 * size + 0.75 * (20px + 0.45 * 2 * size))", + 0.75: "calc-size(100%, (0.125 * size) + (0.75 * (20px + (0.9 * size))))", }, }, { @@ -106,7 +106,7 @@ var TESTS = [ start: "calc-size(40%, size)", end: "calc-size(calc-size(10px, (2 * size)), size + 20px)", expected: { - 0.75: "calc-size(100%, 30px + 0.25 * 0.4 * size)", + 0.75: "calc-size(100%, 30px + (0.1 * size))", }, }, { diff --git a/tests/wpt/tests/css/css-values/calc-size/calc-size-parsing.html b/tests/wpt/tests/css/css-values/calc-size/calc-size-parsing.html index 3d63f0dbe00..a7e948497e7 100644 --- a/tests/wpt/tests/css/css-values/calc-size/calc-size-parsing.html +++ b/tests/wpt/tests/css/css-values/calc-size/calc-size-parsing.html @@ -37,8 +37,8 @@ test_valid_value("min-inline-size", "calc-size(max-content, size)"); test_valid_value("width", "calc-size(fit-content, size)"); test_valid_value("height", "calc-size(min-content, size * 2)", "calc-size(min-content, 2 * size)"); test_valid_value("max-width", "calc-size(max-content, size / 2)", "calc-size(max-content, 0.5 * size)"); -test_valid_value("max-height", "calc-size(fit-content, 30px + size / 2)", "calc-size(fit-content, 30px + 0.5 * size)"); -test_valid_value("width", "calc-size(fit-content, 50% + size / 2)", "calc-size(fit-content, 50% + 0.5 * size)"); +test_valid_value("max-height", "calc-size(fit-content, 30px + size / 2)", "calc-size(fit-content, 30px + (0.5 * size))"); +test_valid_value("width", "calc-size(fit-content, 50% + size / 2)", "calc-size(fit-content, 50% + (0.5 * size))"); test_valid_value("width", "calc-size(any, 25em)"); test_valid_value("width", "calc-size(any, 40%)"); diff --git a/tests/wpt/tests/css/css-values/calc-size/calc-size-typed-om.html b/tests/wpt/tests/css/css-values/calc-size/calc-size-typed-om.html index 37400823f9d..606de7f5060 100644 --- a/tests/wpt/tests/css/css-values/calc-size/calc-size-typed-om.html +++ b/tests/wpt/tests/css/css-values/calc-size/calc-size-typed-om.html @@ -26,9 +26,9 @@ function test_typed_om_string(property, value, expected) { test_typed_om_string("width", "calc-size(auto, size)"); test_typed_om_string("width", "calc-size(fit-content, size)"); test_typed_om_string("height", "calc-size(min-content, size * 2)", "calc-size(min-content, 2 * size)"); -test_typed_om_string("max-width", "calc-size(max-content, size / 2)", "calc-size(max-content, 0.5 * size)"); -test_typed_om_string("max-height", "calc-size(fit-content, 30px + size / 2)", "calc-size(fit-content, 30px + 0.5 * size)"); -test_typed_om_string("width", "calc-size(fit-content, 50% + size / 2)", "calc-size(fit-content, 50% + 0.5 * size)"); +test_typed_om_string("max-width", "calc-size(max-content, size / 2)", "calc-size(max-content, (0.5 * size))"); +test_typed_om_string("max-height", "calc-size(fit-content, 30px + size / 2)", "calc-size(fit-content, 30px + (0.5 * size))"); +test_typed_om_string("width", "calc-size(fit-content, 50% + size / 2)", "calc-size(fit-content, 50% + (0.5 * size))"); test_typed_om_string("width", "calc-size(any, 30px)"); test_typed_om_string("width", "calc-size(any, 25em)", "calc-size(any, 400px)"); test_typed_om_string("width", "calc-size(any, 40%)"); diff --git a/tests/wpt/tests/css/css-values/exp-log-compute.html b/tests/wpt/tests/css/css-values/exp-log-compute.html index 4bdd507fa33..9b11fe25b32 100644 --- a/tests/wpt/tests/css/css-values/exp-log-compute.html +++ b/tests/wpt/tests/css/css-values/exp-log-compute.html @@ -31,6 +31,7 @@ test_math_used('calc(exp(0) + 1)', '2', {type:'number', approx:0.1}); // Test unresolved at parse time test_math_used('calc(e - exp(sibling-index()))', '0', {type:'number', approx:0.1}); +test_math_used('calc(log(exp(2 * sibling-index())))', '2', {type:'number', approx:0.1}); // Test nesting test_math_used('calc(log(exp(1)))', '1', {type:'number', approx:0.1}); diff --git a/tests/wpt/tests/css/css-values/minmax-length-serialize.html b/tests/wpt/tests/css/css-values/minmax-length-serialize.html index bd00ee05885..1ab6f846379 100644 --- a/tests/wpt/tests/css/css-values/minmax-length-serialize.html +++ b/tests/wpt/tests/css/css-values/minmax-length-serialize.html @@ -70,6 +70,12 @@ test_serialization( 'calc(2px + max(1em + 100px, 106px))', '118px'); +// https://crbug.com/411359798 +test_serialization( + 'calc(2 * (.2 * min(1em, 1px)) + 1px)', + 'calc(1px + (0.4 * min(1em, 1px)))', + '1.4px'); + // Can't test that min()/max() are preserved in computed values with just lengths; // see minmax-length-percentage-serialize for tests of that. </script> |