From d431fd42b36dfa5a67f08d0927bbb1f65e40eca4 Mon Sep 17 00:00:00 2001
From: Christopher Cameron <ccameron@chromium.org>
Date: Thu, 9 Jan 2025 12:16:58 -0800
Subject: [PATCH] CanvasRenderingContext2DSettings: follow the spec types

The type for willReadFrequently is boolean, not an enum with values of
"true", "false", and "undefined".

Add WPT tests for this. And for the rest of the attributes.

The WPT tests failed for the desynchronized property because, when
it was discovered that this feature was never implemented on macOS,
it was disabled at compile time, when parsing the input from V8,
losing the information required to correctly implement
getContextAttributes. Add a temporary workaround for this situation
by separately storing the specified desynchronized value.

Bug: 388290815
Change-Id: I00e6b6c82a23cdb627a3eba1314ebf3b0f9abf9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6157723
Reviewed-by: Yi Xu <yiyix@chromium.org>
Commit-Queue: ccameron chromium <ccameron@chromium.org>
Reviewed-by: Aaron Krajeski <aaronhk@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1404356}
---
 .../getContextAttributes.html                 | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/html/canvas/element/manual/context-attributes/getContextAttributes.html b/html/canvas/element/manual/context-attributes/getContextAttributes.html
index 47b3d96233acf6..9c988638965735 100644
--- a/html/canvas/element/manual/context-attributes/getContextAttributes.html
+++ b/html/canvas/element/manual/context-attributes/getContextAttributes.html
@@ -4,42 +4,67 @@
 <script>
 
 var testScenarios = [
+    // defaults
     {testDescription: "Test default context creation attributes",
         canvasContextAttributes: {},
-        expectedContextAttributes: {alpha: true, desynchronized: false, willReadFrequently: false}},
+        expectedContextAttributes: {alpha: true, desynchronized: false, willReadFrequently: false, colorSpace: "srgb"}},
+    // alpha
     {testDescription: "Test context creation attributes alpha: true",
         canvasContextAttributes: {alpha: true},
         expectedContextAttributes: {alpha: true}},
     {testDescription: "Test context creation attributes alpha: false",
         canvasContextAttributes: {alpha: false},
         expectedContextAttributes: {alpha: false}},
+    // colorSpace
+    {testDescription: "Test context creation attributes colorSpace: 'srgb'",
+        canvasContextAttributes: {colorSpace: "srgb"},
+        expectedContextAttributes: {colorSpace: "srgb"}},
+    {testDescription: "Test context creation attributes colorSpace: 'display-p3'",
+        canvasContextAttributes: {colorSpace: "display-p3"},
+        expectedContextAttributes: {colorSpace: "display-p3"}},
+    // desynchronized
+    {testDescription: "Test context creation attributes desynchronized: true",
+        canvasContextAttributes: {desynchronized: true},
+        expectedContextAttributes: {desynchronized: true}},
     {testDescription: "Test context creation attributes desynchronized: false",
         canvasContextAttributes: {desynchronized: false},
         expectedContextAttributes: {desynchronized: false}},
+    // willReadFrequently
     {testDescription: "Test context creation attributes willReadFrequently: true",
         canvasContextAttributes: {willReadFrequently: true},
         expectedContextAttributes: {willReadFrequently: true}},
+    {testDescription: "Test context creation attributes willReadFrequently: false",
+        canvasContextAttributes: {willReadFrequently: false},
+        expectedContextAttributes: {willReadFrequently: false}},
 ];
 
-function runTestScenario(testScenario) {
+function runTestScenario(canvas, testScenario) {
     var t = test(function() {
-        var canvas = document. createElement('canvas');
         var ctx = canvas.getContext('2d', testScenario.canvasContextAttributes);
         var contextAttributes = ctx.getContextAttributes();
         if (testScenario.expectedContextAttributes.alpha !== undefined) {
             assert_equals(contextAttributes.alpha,
                 testScenario.expectedContextAttributes.alpha);
         }
+        if (testScenario.expectedContextAttributes.colorSpace !== undefined) {
+            assert_equals(contextAttributes.colorSpace,
+                testScenario.expectedContextAttributes.colorSpace);
+        }
         if (testScenario.expectedContextAttributes.desynchronized !== undefined) {
             assert_equals(contextAttributes.desynchronized,
                 testScenario.expectedContextAttributes.desynchronized);
         }
+        if (testScenario.expectedContextAttributes.willReadFrequently !== undefined) {
+            assert_equals(contextAttributes.willReadFrequently,
+                testScenario.expectedContextAttributes.willReadFrequently);
+        }
     }, testScenario.testDescription);
 }
 
 function runAllTests() {
-    for (var i = 0; i < testScenarios.length; i++)
-        runTestScenario(testScenarios[i]);
+    for (var i = 0; i < testScenarios.length; i++) {
+        runTestScenario(document.createElement('canvas'), testScenarios[i]);
+    }
 }
 
 runAllTests();