Changeset 272498 in webkit

Timestamp:

Feb 8, 2021 9:37:13 AM (18 months ago)

Author:

weinig@apple.com

Message:

Update sRGB <-> XYZ conversion matrix values to match values in latest spec
​https://bugs.webkit.org/show_bug.cgi?id=221533

Reviewed by Alex Christensen.

Source/WebCore:

Update values to keep in sync with ​https://github.com/w3c/csswg-drafts/issues/5922.

Updates ExtendedColor API test.

• platform/graphics/ColorConversion.cpp:

Update values to keep in sync with the values used in the CSS Color 4 spec. This
doesn't have any user visible effect, but would reduce errors if round tripping
through this ever became necessary.

Tools:

• TestWebKitAPI/Tests/WebCore/ExtendedColorTests.cpp:

(TestWebKitAPI::TEST):
Update values to values in P3 <-> sRGB conversion test and update to
use EXPECT_FLOAT_EQ so the values can be seen in the output when thigs
fail.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ColorConversion.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/ExtendedColorTests.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-08  Sam Weinig  <weinig@apple.com>
+
+        Update sRGB <-> XYZ conversion matrix values to match values in latest spec
+        https://bugs.webkit.org/show_bug.cgi?id=221533
+
+        Reviewed by Alex Christensen.
+
+        Update values to keep in sync with https://github.com/w3c/csswg-drafts/issues/5922.
+
+        Updates ExtendedColor API test.
+
+        * platform/graphics/ColorConversion.cpp:
+        Update values to keep in sync with the values used in the CSS Color 4 spec. This
+        doesn't have any user visible effect, but would reduce errors if round tripping
+        through this ever became necessary. 
+
 2021-02-08  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/platform/graphics/ColorConversion.cpp

@@ -100 +100 @@
 // sRGB Matrices.
 
-// https://en.wikipedia.org/wiki/SRGB
-// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
+// https://drafts.csswg.org/css-color/#color-conversion-code
 static constexpr ColorMatrix<3, 3> xyzToLinearSRGBMatrix {
-     3.2404542f, -1.5371385f, -0.4985314f,
-    -0.9692660f,  1.8760108f,  0.0415560f,
-     0.0556434f, -0.2040259f,  1.0572252f
-};
-
-// https://en.wikipedia.org/wiki/SRGB
-// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
+     3.2409699419045226f,  -1.537383177570094f,   -0.4986107602930034f,
+    -0.9692436362808796f,   1.8759675015077202f,   0.04155505740717559f,
+     0.05563007969699366f, -0.20397695888897652f,  1.0569715142428786f
+};
+
+// https://drafts.csswg.org/css-color/#color-conversion-code
 static constexpr ColorMatrix<3, 3> linearSRGBToXYZMatrix {
-    0.4124564f,  0.3575761f,  0.1804375f,
-    0.2126729f,  0.7151522f,  0.0721750f,
-    0.0193339f,  0.1191920f,  0.9503041f
+    0.41239079926595934f, 0.357584339383878f,   0.1804807884018343f,
+    0.21263900587151027f, 0.715168678767756f,   0.07219231536073371f,
+    0.01933081871559182f, 0.11919477979462598f, 0.9505321522496607f
 };
 

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-08  Sam Weinig  <weinig@apple.com>
+
+        Update sRGB <-> XYZ conversion matrix values to match values in latest spec
+        https://bugs.webkit.org/show_bug.cgi?id=221533
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/Tests/WebCore/ExtendedColorTests.cpp:
+        (TestWebKitAPI::TEST):
+        Update values to values in P3 <-> sRGB conversion test and update to
+        use EXPECT_FLOAT_EQ so the values can be seen in the output when thigs
+        fail.
+
 2021-02-08  Lauro Moura  <lmoura@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/ExtendedColorTests.cpp

@@ -238 +238 @@
 
     auto sRGBAColor = p3Color.toSRGBALossy<float>();
-    EXPECT_TRUE(WTF::areEssentiallyEqual(sRGBAColor.red, 1.0f));
-    EXPECT_TRUE(WTF::areEssentiallyEqual(sRGBAColor.green, 0.462537885f));
-    EXPECT_TRUE(WTF::areEssentiallyEqual(sRGBAColor.blue, 0.149147838f));
-    EXPECT_TRUE(WTF::areEssentiallyEqual(sRGBAColor.alpha, 0.75f));
+    EXPECT_FLOAT_EQ(sRGBAColor.red, 1.0f);
+    EXPECT_FLOAT_EQ(sRGBAColor.green, 0.46253282f);
+    EXPECT_FLOAT_EQ(sRGBAColor.blue, 0.14912748f);
+    EXPECT_FLOAT_EQ(sRGBAColor.alpha, 0.75f);
 }
 
@@ -250 +250 @@
 
     auto sRGBAColor = linearSRGBAColor.toSRGBALossy<float>();
-    EXPECT_TRUE(WTF::areEssentiallyEqual(sRGBAColor.red, 1.0f));
-    EXPECT_TRUE(WTF::areEssentiallyEqual(sRGBAColor.green, 0.735356927f));
-    EXPECT_TRUE(WTF::areEssentiallyEqual(sRGBAColor.blue, 0.537098706f));
-    EXPECT_TRUE(WTF::areEssentiallyEqual(sRGBAColor.alpha, 0.75f));
+    EXPECT_FLOAT_EQ(sRGBAColor.red, 1.0f);
+    EXPECT_FLOAT_EQ(sRGBAColor.green, 0.735356927f);
+    EXPECT_FLOAT_EQ(sRGBAColor.blue, 0.537098706f);
+    EXPECT_FLOAT_EQ(sRGBAColor.alpha, 0.75f);
 }