mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-20 11:36:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Return correct computed value for lab-like and lch-like colors

Browse source
This commit is contained in:
Tim Ledbetter 2025-04-19 14:02:10 +01:00
parent 964475cdff
commit 2bae4b8bf7
3 changed files with 312 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibWeb/CSS/CSSStyleProperties.cpp
View file

@ -595,6 +595,11 @@ static RefPtr<CSSStyleValue const> resolve_color_style_value(CSSStyleValue const
{
if (style_value.is_color_function())
return style_value;
if (style_value.is_color()) {
auto& color_style_value = static_cast<CSSColorValue const&>(style_value);
if (first_is_one_of(color_style_value.color_type(), CSSColorValue::ColorType::Lab, CSSColorValue::ColorType::OKLab, CSSColorValue::ColorType::LCH, CSSColorValue::ColorType::OKLCH))
return style_value;
}
return CSSColorValue::create_from_color(computed_color, ColorSyntax::Modern);
}

126
Tests/LibWeb/Text/expected/wpt-import/css/css-color/parsing/color-computed-lab.txt Normal file
View file

@ -0,0 +1,126 @@
Harness status: OK
Found 120 tests
104 Pass
16 Fail
Pass Property color value 'lab(0 0 0)'
Pass Property color value 'lab(0 0 0 / 1)'
Pass Property color value 'lab(0 0 0 / 0.5)'
Pass Property color value 'lab(20 0 10/0.5)'
Pass Property color value 'lab(20 0 10/50%)'
Pass Property color value 'lab(400 0 10/50%)'
Pass Property color value 'lab(50 -160 160)'
Pass Property color value 'lab(50 -200 200)'
Pass Property color value 'lab(0 0 0 / -10%)'
Pass Property color value 'lab(0 0 0 / 110%)'
Pass Property color value 'lab(0 0 0 / 300%)'
Pass Property color value 'lab(-40 0 0)'
Pass Property color value 'lab(50 -20 0)'
Pass Property color value 'lab(50 0 -20)'
Pass Property color value 'lab(calc(50 * 3) calc(0.5 - 1) calc(1.5) / calc(-0.5 + 1))'
Pass Property color value 'lab(calc(-50 * 3) calc(0.5 + 1) calc(-1.5) / calc(-0.5 * 2))'
Pass Property color value 'lab(none none none / none)'
Pass Property color value 'lab(none none none)'
Pass Property color value 'lab(20 none none / none)'
Pass Property color value 'lab(none none none / 0.5)'
Pass Property color value 'lab(0 0 0 / none)'
Pass Property color value 'lab(calc(NaN) 0 0)'
Pass Property color value 'lab(calc(0 / 0) 0 0)'
Pass Property color value 'oklab(0 0 0)'
Pass Property color value 'oklab(0 0 0 / 1)'
Pass Property color value 'oklab(0 0 0 / 0.5)'
Pass Property color value 'oklab(0.2 0 0.1/0.5)'
Pass Property color value 'oklab(0.2 0 0.1/50%)'
Pass Property color value 'oklab(4 0 0.1/50%)'
Pass Property color value 'oklab(0.5 -1.6 1.6)'
Pass Property color value 'oklab(0.5 -2 2)'
Pass Property color value 'oklab(0 0 0 / -10%)'
Pass Property color value 'oklab(0 0 0 / 110%)'
Pass Property color value 'oklab(0 0 0 / 300%)'
Pass Property color value 'oklab(-0.4 0 0)'
Pass Property color value 'oklab(0.5 -0.2 0)'
Pass Property color value 'oklab(0.5 0 -0.2)'
Pass Property color value 'oklab(calc(0.5 * 3) calc(0.5 - 1) calc(1.5) / calc(-0.5 + 1))'
Pass Property color value 'oklab(calc(-0.5 * 3) calc(0.5 + 1) calc(-1.5) / calc(-0.5 * 2))'
Pass Property color value 'oklab(none none none / none)'
Pass Property color value 'oklab(none none none)'
Pass Property color value 'oklab(0.2 none none / none)'
Pass Property color value 'oklab(none none none / 0.5)'
Pass Property color value 'oklab(0 0 0 / none)'
Pass Property color value 'lab(20% -50% 90%/0.5)'
Pass Property color value 'oklab(20% 70% -80%/0.5)'
Pass Property color value 'oklab(calc(NaN) 0 0)'
Pass Property color value 'oklab(calc(0 / 0) 0 0)'
Pass Property color value 'lch(0 0 0deg)'
Pass Property color value 'lch(0 0 0deg / 1)'
Pass Property color value 'lch(0 0 0deg / 0.5)'
Pass Property color value 'lch(100 230 0deg / 0.5)'
Pass Property color value 'lch(20 50 20deg/0.5)'
Pass Property color value 'lch(20 50 20deg/50%)'
Pass Property color value 'lch(10 20 20deg / -10%)'
Pass Property color value 'lch(10 20 20deg / 110%)'
Pass Property color value 'lch(10 20 1.28rad)'
Pass Property color value 'lch(10 20 380deg)'
Pass Property color value 'lch(10 20 -340deg)'
Pass Property color value 'lch(10 20 740deg)'
Pass Property color value 'lch(10 20 -700deg)'
Pass Property color value 'lch(-40 0 0)'
Pass Property color value 'lch(20 -20 0)'
Pass Property color value 'lch(0 0 0 / 0.5)'
Pass Property color value 'lch(10 20 20 / 110%)'
Pass Property color value 'lch(10 20 -700)'
Pass Property color value 'lch(calc(50 * 3) calc(0.5 - 1) calc(20deg * 2) / calc(-0.5 + 1))'
Pass Property color value 'lch(calc(-50 * 3) calc(0.5 + 1) calc(-20deg * 2) / calc(-0.5 * 2))'
Pass Property color value 'lch(none none none / none)'
Pass Property color value 'lch(none none none)'
Pass Property color value 'lch(20 none none / none)'
Pass Property color value 'lch(none none none / 0.5)'
Pass Property color value 'lch(0 0 0 / none)'
Pass Property color value 'lch(calc(NaN) 0 0)'
Pass Property color value 'lch(calc(0 / 0) 0 0)'
Pass Property color value 'oklch(0 0 0deg)'
Pass Property color value 'oklch(0 0 0deg / 1)'
Pass Property color value 'oklch(0 0 0deg / 0.5)'
Pass Property color value 'oklch(1 2.3 0deg / 0.5)'
Pass Property color value 'oklch(0.2 0.5 20deg/0.5)'
Pass Property color value 'oklch(0.2 0.5 20deg/50%)'
Pass Property color value 'oklch(0.1 0.2 20deg / -10%)'
Pass Property color value 'oklch(0.1 0.2 20deg / 110%)'
Pass Property color value 'oklch(0.1 0.2 1.28rad)'
Pass Property color value 'oklch(0.1 0.2 380deg)'
Pass Property color value 'oklch(0.1 0.2 -340deg)'
Pass Property color value 'oklch(0.1 0.2 740deg)'
Pass Property color value 'oklch(0.1 0.2 -700deg)'
Pass Property color value 'oklch(-0.4 0 0)'
Pass Property color value 'oklch(0.2 -0.2 0)'
Pass Property color value 'oklch(0 0 0 / 0.5)'
Pass Property color value 'oklch(0.1 0.2 20 / 110%)'
Pass Property color value 'oklch(0.1 0.2 -700)'
Pass Property color value 'oklch(calc(0.5 * 3) calc(0.5 - 1) calc(20deg * 2) / calc(-0.5 + 1))'
Pass Property color value 'oklch(calc(-0.5 * 3) calc(0.5 + 1) calc(-20deg * 2) / calc(-0.5 * 2))'
Pass Property color value 'oklch(none none none / none)'
Pass Property color value 'oklch(none none none)'
Pass Property color value 'oklch(0.2 none none / none)'
Pass Property color value 'oklch(none none none / 0.5)'
Pass Property color value 'oklch(0 0 0 / none)'
Pass Property color value 'lch(20% 80% 10/0.5)'
Pass Property color value 'oklch(20% 60% 10/0.5)'
Pass Property color value 'oklch(calc(NaN) 0 0)'
Pass Property color value 'oklch(calc(0 / 0) 0 0)'
Fail Property color value 'lab(calc(50 + (sign(1em - 10px) * 10)) 30 50 / 50%)'
Fail Property color value 'oklab(calc(0.5 + (sign(1em - 10px) * 0.1)) 0.3 0.5 / 50%)'
Fail Property color value 'lab(60 30 50 / calc(50% + (sign(1em - 10px) * 10%)))'
Fail Property color value 'oklab(0.6 0.3 0.5 / calc(50% + (sign(1em - 10px) * 10%)))'
Fail Property color value 'lch(calc(50 + (sign(1em - 10px) * 10)) 30 50deg / 50%)'
Fail Property color value 'oklch(calc(0.5 + (sign(1em - 10px) * 0.1)) 0.3 50deg / 50%)'
Fail Property color value 'lch(60 30 50deg / calc(50% + (sign(1em - 10px) * 10%)))'
Fail Property color value 'oklch(0.6 0.3 50deg / calc(50% + (sign(1em - 10px) * 10%)))'
Fail Property color value 'lab(calc(50 + (sign(2cqw - 10px) * 10)) 30 50 / 0.51)'
Fail Property color value 'oklab(calc(0.5 + (sign(2cqw - 10px) * 0.1)) 0.3 0.5 / 0.51)'
Fail Property color value 'lch(calc(50 + (sign(2cqw - 10px) * 10)) 30 50 / 0.51)'
Fail Property color value 'oklch(calc(0.5 + (sign(2cqw - 10px) * 0.1)) 0.3 50 / 0.51)'
Fail Property color value 'lab(calc(50 + (sign(2cqw - 10px) * 10)) 30 50 / 0.52)'
Fail Property color value 'oklab(calc(0.5 + (sign(2cqw - 10px) * 0.1)) 0.3 0.5 / 0.52)'
Fail Property color value 'lch(calc(50 + (sign(2cqw - 10px) * 10)) 30 50 / 0.52)'
Fail Property color value 'oklch(calc(0.5 + (sign(2cqw - 10px) * 0.1)) 0.3 50 / 0.52)'

181
Tests/LibWeb/Text/input/wpt-import/css/css-color/parsing/color-computed-lab.html Normal file
View file

@ -0,0 +1,181 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>CSS Color Level 4: Computation of colors using Lab notation</title>
<link rel="help" href="https://drafts.csswg.org/css-color-4/#lab-colors">
<link rel="help" href="https://drafts.csswg.org/css-color-4/#resolving-lab-lch-values">
<link rel="help" href="https://drafts.csswg.org/css-color-4/#resolving-oklab-oklch-values">
<link rel="help" href="https://drafts.csswg.org/css-color-4/#serializing-lab-lch">
<link rel="help" href="https://drafts.csswg.org/css-color-4/#serializing-oklab-oklch">
<script src="../../../resources/testharness.js"></script>
<script src="../../../resources/testharnessreport.js"></script>
<script src="../../../css/support/computed-testcommon.js"></script>
</head>
<body>
<div id="container">
<div id="target"></div>
</div>
<style>
#container {
container-type: inline-size;
color: rgb(255, 0, 0]);
}
</style>
<script>
tests = [
// lab()
["lab(0 0 0)", "lab(0 0 0)"],
["lab(0 0 0 / 1)", "lab(0 0 0)"],
["lab(0 0 0 / 0.5)", "lab(0 0 0 / 0.5)"],
["lab(20 0 10/0.5)", "lab(20 0 10 / 0.5)"],
["lab(20 0 10/50%)", "lab(20 0 10 / 0.5)"],
["lab(400 0 10/50%)", "lab(100 0 10 / 0.5)"],
["lab(50 -160 160)", "lab(50 -160 160)"],
["lab(50 -200 200)", "lab(50 -200 200)"],
["lab(0 0 0 / -10%)", "lab(0 0 0 / 0)"],
["lab(0 0 0 / 110%)", "lab(0 0 0)"],
["lab(0 0 0 / 300%)", "lab(0 0 0)"],
["lab(-40 0 0)", "lab(0 0 0)"],
["lab(50 -20 0)", "lab(50 -20 0)"],
["lab(50 0 -20)", "lab(50 0 -20)"],
["lab(calc(50 * 3) calc(0.5 - 1) calc(1.5) / calc(-0.5 + 1))", "lab(100 -0.5 1.5 / 0.5)"],
["lab(calc(-50 * 3) calc(0.5 + 1) calc(-1.5) / calc(-0.5 * 2))", "lab(0 1.5 -1.5 / 0)"],
["lab(none none none / none)", "lab(none none none / none)"],
["lab(none none none)", "lab(none none none)"],
["lab(20 none none / none)", "lab(20 none none / none)"],
["lab(none none none / 0.5)", "lab(none none none / 0.5)"],
["lab(0 0 0 / none)", "lab(0 0 0 / none)"],
["lab(calc(NaN) 0 0)", "lab(0 0 0)"],
["lab(calc(0 / 0) 0 0)", "lab(0 0 0)"],
// oklab()
["oklab(0 0 0)", "oklab(0 0 0)"],
["oklab(0 0 0 / 1)", "oklab(0 0 0)"],
["oklab(0 0 0 / 0.5)", "oklab(0 0 0 / 0.5)"],
["oklab(0.2 0 0.1/0.5)", "oklab(0.2 0 0.1 / 0.5)"],
["oklab(0.2 0 0.1/50%)", "oklab(0.2 0 0.1 / 0.5)"],
["oklab(4 0 0.1/50%)", "oklab(1 0 0.1 / 0.5)"],
["oklab(0.5 -1.6 1.6)", "oklab(0.5 -1.6 1.6)"],
["oklab(0.5 -2 2)", "oklab(0.5 -2 2)"],
["oklab(0 0 0 / -10%)", "oklab(0 0 0 / 0)"],
["oklab(0 0 0 / 110%)", "oklab(0 0 0)"],
["oklab(0 0 0 / 300%)", "oklab(0 0 0)"],
["oklab(-0.4 0 0)", "oklab(0 0 0)"],
["oklab(0.5 -0.2 0)", "oklab(0.5 -0.2 0)"],
["oklab(0.5 0 -0.2)", "oklab(0.5 0 -0.2)"],
["oklab(calc(0.5 * 3) calc(0.5 - 1) calc(1.5) / calc(-0.5 + 1))", "oklab(1 -0.5 1.5 / 0.5)"],
["oklab(calc(-0.5 * 3) calc(0.5 + 1) calc(-1.5) / calc(-0.5 * 2))", "oklab(0 1.5 -1.5 / 0)"],
["oklab(none none none / none)", "oklab(none none none / none)"],
["oklab(none none none)", "oklab(none none none)"],
["oklab(0.2 none none / none)", "oklab(0.2 none none / none)"],
["oklab(none none none / 0.5)", "oklab(none none none / 0.5)"],
["oklab(0 0 0 / none)", "oklab(0 0 0 / none)"],
// These tests validate the ranges of lab() vs. oklab() components
["lab(20% -50% 90%/0.5)", "lab(20 -62.5 112.5 / 0.5)"],
["oklab(20% 70% -80%/0.5)", "oklab(0.2 0.28 -0.32 / 0.5)"],
["oklab(calc(NaN) 0 0)", "oklab(0 0 0)"],
["oklab(calc(0 / 0) 0 0)", "oklab(0 0 0)"],
// lch()
["lch(0 0 0deg)", "lch(0 0 0)"],
["lch(0 0 0deg / 1)", "lch(0 0 0)"],
["lch(0 0 0deg / 0.5)", "lch(0 0 0 / 0.5)"],
["lch(100 230 0deg / 0.5)", "lch(100 230 0 / 0.5)"],
["lch(20 50 20deg/0.5)", "lch(20 50 20 / 0.5)"],
["lch(20 50 20deg/50%)", "lch(20 50 20 / 0.5)"],
["lch(10 20 20deg / -10%)", "lch(10 20 20 / 0)"],
["lch(10 20 20deg / 110%)", "lch(10 20 20)"],
["lch(10 20 1.28rad)", "lch(10 20 73.3386)"],
["lch(10 20 380deg)", "lch(10 20 20)"],
["lch(10 20 -340deg)", "lch(10 20 20)"],
["lch(10 20 740deg)", "lch(10 20 20)"],
["lch(10 20 -700deg)", "lch(10 20 20)"],
["lch(-40 0 0)", "lch(0 0 0)"],
["lch(20 -20 0)", "lch(20 0 0)"],
["lch(0 0 0 / 0.5)", "lch(0 0 0 / 0.5)"],
["lch(10 20 20 / 110%)", "lch(10 20 20)"],
["lch(10 20 -700)", "lch(10 20 20)"],
["lch(calc(50 * 3) calc(0.5 - 1) calc(20deg * 2) / calc(-0.5 + 1))", "lch(100 0 40 / 0.5)"],
["lch(calc(-50 * 3) calc(0.5 + 1) calc(-20deg * 2) / calc(-0.5 * 2))", "lch(0 1.5 320 / 0)"],
["lch(none none none / none)", "lch(none none none / none)"],
["lch(none none none)", "lch(none none none)"],
["lch(20 none none / none)", "lch(20 none none / none)"],
["lch(none none none / 0.5)", "lch(none none none / 0.5)"],
["lch(0 0 0 / none)", "lch(0 0 0 / none)"],
["lch(calc(NaN) 0 0)", "lch(0 0 0)"],
["lch(calc(0 / 0) 0 0)", "lch(0 0 0)"],
// oklch()
["oklch(0 0 0deg)", "oklch(0 0 0)"],
["oklch(0 0 0deg / 1)", "oklch(0 0 0)"],
["oklch(0 0 0deg / 0.5)", "oklch(0 0 0 / 0.5)"],
["oklch(1 2.3 0deg / 0.5)", "oklch(1 2.3 0 / 0.5)"],
["oklch(0.2 0.5 20deg/0.5)", "oklch(0.2 0.5 20 / 0.5)"],
["oklch(0.2 0.5 20deg/50%)", "oklch(0.2 0.5 20 / 0.5)"],
["oklch(0.1 0.2 20deg / -10%)", "oklch(0.1 0.2 20 / 0)"],
["oklch(0.1 0.2 20deg / 110%)", "oklch(0.1 0.2 20)"],
["oklch(0.1 0.2 1.28rad)", "oklch(0.1 0.2 73.3386)"],
["oklch(0.1 0.2 380deg)", "oklch(0.1 0.2 20)"],
["oklch(0.1 0.2 -340deg)", "oklch(0.1 0.2 20)"],
["oklch(0.1 0.2 740deg)", "oklch(0.1 0.2 20)"],
["oklch(0.1 0.2 -700deg)", "oklch(0.1 0.2 20)"],
["oklch(-0.4 0 0)", "oklch(0 0 0)"],
["oklch(0.2 -0.2 0)", "oklch(0.2 0 0)"],
["oklch(0 0 0 / 0.5)", "oklch(0 0 0 / 0.5)"],
["oklch(0.1 0.2 20 / 110%)", "oklch(0.1 0.2 20)"],
["oklch(0.1 0.2 -700)", "oklch(0.1 0.2 20)"],
["oklch(calc(0.5 * 3) calc(0.5 - 1) calc(20deg * 2) / calc(-0.5 + 1))", "oklch(1 0 40 / 0.5)"],
["oklch(calc(-0.5 * 3) calc(0.5 + 1) calc(-20deg * 2) / calc(-0.5 * 2))", "oklch(0 1.5 320 / 0)"],
["oklch(none none none / none)", "oklch(none none none / none)"],
["oklch(none none none)", "oklch(none none none)"],
["oklch(0.2 none none / none)", "oklch(0.2 none none / none)"],
["oklch(none none none / 0.5)", "oklch(none none none / 0.5)"],
["oklch(0 0 0 / none)", "oklch(0 0 0 / none)"],
// These tests validate the ranges of lch() vs. oklch() lightness and chroma
["lch(20% 80% 10/0.5)", "lch(20 120 10 / 0.5)"],
["oklch(20% 60% 10/0.5)", "oklch(0.2 0.24 10 / 0.5)"],
["oklch(calc(NaN) 0 0)", "oklch(0 0 0)"],
["oklch(calc(0 / 0) 0 0)", "oklch(0 0 0)"],
// calc(50% + (sign(1em - 10px) * 10%)), with its font relative units, must be evaluatated for computed value.
["lab(calc(50 + (sign(1em - 10px) * 10)) 30 50 / 50%)", "lab(60 30 50 / 0.5)"],
["oklab(calc(0.5 + (sign(1em - 10px) * 0.1)) 0.3 0.5 / 50%)", "oklab(0.6 0.3 0.5 / 0.5)"],
["lab(60 30 50 / calc(50% + (sign(1em - 10px) * 10%)))", "lab(60 30 50 / 0.6)"],
["oklab(0.6 0.3 0.5 / calc(50% + (sign(1em - 10px) * 10%)))", "oklab(0.6 0.3 0.5 / 0.6)"],
["lch(calc(50 + (sign(1em - 10px) * 10)) 30 50deg / 50%)", "lch(60 30 50 / 0.5)"],
["oklch(calc(0.5 + (sign(1em - 10px) * 0.1)) 0.3 50deg / 50%)", "oklch(0.6 0.3 50 / 0.5)"],
["lch(60 30 50deg / calc(50% + (sign(1em - 10px) * 10%)))", "lch(60 30 50 / 0.6)"],
["oklch(0.6 0.3 50deg / calc(50% + (sign(1em - 10px) * 10%)))", "oklch(0.6 0.3 50 / 0.6)"],
];
for (const test of tests) {
test_computed_value("color", test[0], test[1], test[2] ? `[${test[2]}]` : undefined);
}
// Ensure that `calc` values work with dynamically changing relative units (slighly different alpha values to make test harness not complain about duplicate tests).
document.getElementById("container").style.width = "1000px";
test_computed_value("color", "lab(calc(50 + (sign(2cqw - 10px) * 10)) 30 50 / 0.51)", "lab(60 30 50 / 0.51)");
test_computed_value("color", "oklab(calc(0.5 + (sign(2cqw - 10px) * 0.1)) 0.3 0.5 / 0.51)", "oklab(0.6 0.3 0.5 / 0.51)");
test_computed_value("color", "lch(calc(50 + (sign(2cqw - 10px) * 10)) 30 50 / 0.51)", "lch(60 30 50 / 0.51)");
test_computed_value("color", "oklch(calc(0.5 + (sign(2cqw - 10px) * 0.1)) 0.3 50 / 0.51)", "oklch(0.6 0.3 50 / 0.51)");
document.getElementById("container").style.width = "100px";
test_computed_value("color", "lab(calc(50 + (sign(2cqw - 10px) * 10)) 30 50 / 0.52)", "lab(40 30 50 / 0.52)");
test_computed_value("color", "oklab(calc(0.5 + (sign(2cqw - 10px) * 0.1)) 0.3 0.5 / 0.52)", "oklab(0.4 0.3 0.5 / 0.52)");
test_computed_value("color", "lch(calc(50 + (sign(2cqw - 10px) * 10)) 30 50 / 0.52)", "lch(40 30 50 / 0.52)");
test_computed_value("color", "oklch(calc(0.5 + (sign(2cqw - 10px) * 0.1)) 0.3 50 / 0.52)", "oklch(0.4 0.3 50 / 0.52)");
</script>
</body>
</html>