LibGfx: Use CSS sRGB serialization for canvas fill styles

tcl3 · gmta · commit 8854bb62c636 · 2025-10-26T18:55:22.000+01:00
diff --git a/Libraries/LibGfx/Color.cpp b/Libraries/LibGfx/Color.cpp
@@ -112,9 +112,7 @@ String Color::to_string(HTMLCompatibleSerialization html_compatible_serializatio
     }
 
     // Otherwise, for sRGB the CSS serialization of sRGB values is used and for other color spaces, the relevant serialization of the <color> value.
-    if (alpha() < 255)
-        return MUST(String::formatted("rgba({}, {}, {}, {})", red(), green(), blue(), alpha() / 255.0));
-    return MUST(String::formatted("rgb({}, {}, {})", red(), green(), blue()));
+    return serialize_a_srgb_value();
 }
 
 String Color::to_string_without_alpha() const
diff --git a/Tests/LibWeb/Text/expected/wpt-import/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.txt b/Tests/LibWeb/Text/expected/wpt-import/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.txt
@@ -0,0 +1,6 @@
+Harness status: OK
+
+Found 1 tests
+
+1 Pass
+Pass	Canvas test: 2d.fillStyle.get.halftransparent
diff --git a/Tests/LibWeb/Text/input/wpt-import/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html b/Tests/LibWeb/Text/input/wpt-import/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.fillStyle.get.halftransparent</title>
+<script src="../../../../resources/testharness.js"></script>
+<script src="../../../../resources/testharnessreport.js"></script>
+<script src="../../../../html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="../../../../html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.fillStyle.get.halftransparent</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+  ctx.fillStyle = 'rgba(255,255,255,0.5)';
+  _assertSame(ctx.fillStyle, 'rgba(255, 255, 255, 0.5)', "ctx.fillStyle", "'rgba(255, 255, 255, 0.5)'");
+
+});
+</script>
+

Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,7 @@ String Color::to_string(HTMLCompatibleSerialization html_compatible_serializatio`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`// Otherwise, for sRGB the CSS serialization of sRGB values is used and for other color spaces, the relevant serialization of the <color> value.`
`115`		`- if (alpha() < 255)`
`116`		`- return MUST(String::formatted("rgba({}, {}, {}, {})", red(), green(), blue(), alpha() / 255.0));`
`117`		`- return MUST(String::formatted("rgb({}, {}, {})", red(), green(), blue()));`
	`115`	`+ return serialize_a_srgb_value();`
`118`	`116`	`}`
`119`	`117`
`120`	`118`	`String Color::to_string_without_alpha() const`