tree 0d2fd1e8030c448ad015ae90a7e9ac1c721d6dfe
parent a1b821bd3095346d5e11279026fa60f518e18271
author weinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1637853889 +0000
committer weinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1637853889 +0000

[CSS Color 4] Add support for new srgb-linear, xyz-d50 and xyz-d65 colorspaces
https://bugs.webkit.org/show_bug.cgi?id=233475

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Update existing color(xyz ...) tests for new d65 whitepoint and add new tests
for color(srgb-linear ...), color(xyz-d50 ...) and color(xyz-d65 ...).

* web-platform-tests/css/css-color/predefined-016.html:
* web-platform-tests/css/css-color/srgb-linear-001-expected.html: Added.
* web-platform-tests/css/css-color/srgb-linear-001.html: Added.
* web-platform-tests/css/css-color/srgb-linear-002-expected.html: Added.
* web-platform-tests/css/css-color/srgb-linear-002.html: Added.
* web-platform-tests/css/css-color/srgb-linear-003-expected.html: Added.
* web-platform-tests/css/css-color/srgb-linear-003.html: Added.
* web-platform-tests/css/css-color/srgb-linear-004-expected.html: Added.
* web-platform-tests/css/css-color/srgb-linear-004.html: Added.
* web-platform-tests/css/css-color/xyz-001.html:
* web-platform-tests/css/css-color/xyz-003-expected.html:
* web-platform-tests/css/css-color/xyz-003.html:
* web-platform-tests/css/css-color/xyz-004-expected.html:
* web-platform-tests/css/css-color/xyz-004.html:
* web-platform-tests/css/css-color/xyz-005.html:
* web-platform-tests/css/css-color/xyz-d50-001-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d50-001.html: Added.
* web-platform-tests/css/css-color/xyz-d50-002-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d50-002.html: Added.
* web-platform-tests/css/css-color/xyz-d50-003-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d50-003.html: Added.
* web-platform-tests/css/css-color/xyz-d50-004-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d50-004.html: Added.
* web-platform-tests/css/css-color/xyz-d50-005-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d50-005.html: Added.
* web-platform-tests/css/css-color/xyz-d65-001-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d65-001.html: Added.
* web-platform-tests/css/css-color/xyz-d65-002-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d65-002.html: Added.
* web-platform-tests/css/css-color/xyz-d65-003-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d65-003.html: Added.
* web-platform-tests/css/css-color/xyz-d65-004-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d65-004.html: Added.
* web-platform-tests/css/css-color/xyz-d65-005-expected.html: Added.
* web-platform-tests/css/css-color/xyz-d65-005.html: Added.

Source/WebCore:

Updates existing tests to add cases for the new colorspaces.

- Adds support for color(srgb-linear ...), color(xyz-d50 ...) and color(xyz-d65 ...)
- Updates color(xyz ...) to be an alias of color(xyz-d65 ...), which is a breaking change
  both because previously it used the d50 white point and because we now serialize it
  as color(xyz-d65 ...). We think this is acceptable as we just shipped the feature and
  no other browsers yet support it.
- Adds support for color-mix(in xyz-d50, ...) and color-mix(in xyz-d65, ...).
- Updates color-mix(in xyz, ...) to use the d65 white point (like above). We have not shipped
  color-mix enabled, so this should even less controvertial.

* css/CSSValueKeywords.in:
Add new keywords.

* css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::parseRelativeColorFunctionForRGBTypes):
(WebCore::CSSPropertyParserHelpers::parseColorFunctionForRGBTypes):
(WebCore::CSSPropertyParserHelpers::parseColorFunctionForXYZTypes):
(WebCore::CSSPropertyParserHelpers::parseRelativeColorFunctionForXYZTypes):
(WebCore::CSSPropertyParserHelpers::parseRelativeColorFunctionParameters):
(WebCore::CSSPropertyParserHelpers::parseNonRelativeColorFunctionParameters):
(WebCore::CSSPropertyParserHelpers::consumeColorMixColorSpaceAndComma):
(WebCore::CSSPropertyParserHelpers::mixColorComponents):
Add/update parsing support for new/updated colorspaces. parseColorFunctionForXYZTypes
is now templatized like parseColorFunctionForRGBTypes to allow reusing it for each
of the XYZ types.

* platform/graphics/ColorSpace.h:
(WebCore::callWithColorType):
* platform/graphics/ColorSpace.cpp:
(WebCore::operator<<):
* platform/graphics/ColorConversion.cpp:
(WebCore::converColorComponents):
Add new "named" colorspace, XYZ_D65, so that color(xyz-d65 ...) can be piped through
and serialized correctly. We already had a name for srgb-linear (though it was not
possible to create it from css previously) so no new name was needed for it.

* platform/graphics/ColorSerialization.cpp:
(WebCore::serialization):
(WebCore::serializationForCSS):
(WebCore::serializationForHTML):
(WebCore::serializationForRenderTreeAsText):
Add serialization specialization for xyz-d50/xyz-d65 and update name of LinearSRGBA
to "srgb-linear" to match the now defined name in css.

* platform/graphics/cg/ColorCG.cpp:
(WebCore::Color::createAndLosslesslyConvertToSupportedColorSpace):
* platform/graphics/cg/ColorSpaceCG.cpp:
(WebCore::xyzD50ColorSpaceRef):
(WebCore::colorSpaceForCGColorSpace):
(WebCore::xyzColorSpaceRef): Deleted.
* platform/graphics/cg/ColorSpaceCG.h:
(WebCore::cachedNullableCGColorSpace):
Updates xyzColorSpaceRef() function to be named xyzD50ColorSpaceRef() to more accurately
state what it is. It is not yet clear how or if an xyz-d65 colorspace can be created in
CoreGraphics, so we return nullptr when requested. This does not change any rendered values
as we can convert to extended-srgb in that case (as we do with lab and lch) without any loss.

LayoutTests:

Update tests for new srgb-linear, xyz-d50 and xyz-d65 colorspaces

* fast/css/parsing-color-function-expected.txt:
* fast/css/parsing-color-function.html:
* fast/css/parsing-color-mix-expected.txt:
* fast/css/parsing-color-mix.html:
* fast/css/parsing-relative-color-syntax-expected.txt:
* fast/css/parsing-relative-color-syntax.html:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@286168 268f45cc-cd09-0410-ab3c-d52691b4dbfc