diff --git a/Libraries/LibWeb/CSS/StyleValues/CSSColorValue.cpp b/Libraries/LibWeb/CSS/StyleValues/CSSColorValue.cpp index fd39275a2b0..b89bd5ff9a2 100644 --- a/Libraries/LibWeb/CSS/StyleValues/CSSColorValue.cpp +++ b/Libraries/LibWeb/CSS/StyleValues/CSSColorValue.cpp @@ -109,4 +109,41 @@ Optional CSSColorValue::resolve_alpha(CSSStyleValue const& style_value) return {}; } +void CSSColorValue::serialize_color_component(StringBuilder& builder, SerializationMode mode, CSSStyleValue const& component, float one_hundred_percent_value, Optional clamp_min, Optional clamp_max) const +{ + if (component.to_keyword() == Keyword::None) { + builder.append("none"sv); + return; + } + if (component.is_calculated() && mode == SerializationMode::Normal) { + builder.append(component.to_string(mode)); + return; + } + auto resolved_value = resolve_with_reference_value(component, one_hundred_percent_value).value_or(0); + if (clamp_min.has_value() && resolved_value < *clamp_min) + resolved_value = *clamp_min; + if (clamp_max.has_value() && resolved_value > *clamp_max) + resolved_value = *clamp_max; + + // FIXME: Find a better way to format a decimal with trimmed trailing zeroes + auto resolved_string = MUST(String::formatted("{:.2}", resolved_value)); + if (resolved_string.contains('.')) + resolved_string = MUST(resolved_string.trim("0"sv, TrimMode::Right)); + builder.append(resolved_string); +} + +void CSSColorValue::serialize_alpha_component(StringBuilder& builder, SerializationMode mode, CSSStyleValue const& component) const +{ + if (component.to_keyword() == Keyword::None) { + builder.append("none"sv); + return; + } + if (component.is_calculated() && mode == SerializationMode::Normal) { + builder.append(component.to_string(mode)); + return; + } + auto resolved_value = resolve_alpha(component).value_or(0); + builder.appendff("{}", resolved_value); +} + } diff --git a/Libraries/LibWeb/CSS/StyleValues/CSSColorValue.h b/Libraries/LibWeb/CSS/StyleValues/CSSColorValue.h index 00c6e1b2d88..bb5107d2d1b 100644 --- a/Libraries/LibWeb/CSS/StyleValues/CSSColorValue.h +++ b/Libraries/LibWeb/CSS/StyleValues/CSSColorValue.h @@ -61,6 +61,9 @@ protected: static Optional resolve_with_reference_value(CSSStyleValue const&, float one_hundred_percent_value); static Optional resolve_alpha(CSSStyleValue const&); + void serialize_color_component(StringBuilder& builder, SerializationMode mode, CSSStyleValue const& component, float one_hundred_percent_value, Optional clamp_min = {}, Optional clamp_max = {}) const; + void serialize_alpha_component(StringBuilder& builder, SerializationMode mode, CSSStyleValue const& component) const; + ColorType m_color_type; ColorSyntax m_color_syntax; }; diff --git a/Libraries/LibWeb/CSS/StyleValues/CSSLabLike.cpp b/Libraries/LibWeb/CSS/StyleValues/CSSLabLike.cpp index 9c55ed098ce..c9848d67dab 100644 --- a/Libraries/LibWeb/CSS/StyleValues/CSSLabLike.cpp +++ b/Libraries/LibWeb/CSS/StyleValues/CSSLabLike.cpp @@ -1,11 +1,13 @@ /* * Copyright (c) 2024, Sam Atkins + * Copyright (c) 2025, Tim Ledbetter * * SPDX-License-Identifier: BSD-2-Clause */ #include "CSSLabLike.h" #include +#include #include #include #include @@ -35,10 +37,23 @@ Color CSSOKLab::to_color(Optional) const } // https://www.w3.org/TR/css-color-4/#serializing-oklab-oklch -String CSSOKLab::to_string(SerializationMode) const +String CSSOKLab::to_string(SerializationMode mode) const { - // FIXME: Do this properly, taking unresolved calculated values into account. - return serialize_a_srgb_value(to_color({})); + StringBuilder builder; + builder.append("oklab("sv); + serialize_color_component(builder, mode, m_properties.l, 1.0f, 0, 1); + builder.append(' '); + serialize_color_component(builder, mode, m_properties.a, 0.4f); + builder.append(' '); + serialize_color_component(builder, mode, m_properties.b, 0.4f); + if ((!m_properties.alpha->is_number() || m_properties.alpha->as_number().number() < 1) + && (!m_properties.alpha->is_percentage() || m_properties.alpha->as_percentage().percentage().as_fraction() < 1)) { + builder.append(" / "sv); + serialize_alpha_component(builder, mode, m_properties.alpha); + } + + builder.append(')'); + return MUST(builder.to_string()); } Color CSSLab::to_color(Optional) const @@ -52,10 +67,23 @@ Color CSSLab::to_color(Optional) const } // https://www.w3.org/TR/css-color-4/#serializing-lab-lch -String CSSLab::to_string(SerializationMode) const +String CSSLab::to_string(SerializationMode mode) const { - // FIXME: Do this properly, taking unresolved calculated values into account. - return serialize_a_srgb_value(to_color({})); + StringBuilder builder; + builder.append("lab("sv); + serialize_color_component(builder, mode, m_properties.l, 100, 0, 100); + builder.append(' '); + serialize_color_component(builder, mode, m_properties.a, 125); + builder.append(' '); + serialize_color_component(builder, mode, m_properties.b, 125); + if ((!m_properties.alpha->is_number() || m_properties.alpha->as_number().number() < 1) + && (!m_properties.alpha->is_percentage() || m_properties.alpha->as_percentage().percentage().as_fraction() < 1)) { + builder.append(" / "sv); + serialize_alpha_component(builder, mode, m_properties.alpha); + } + + builder.append(')'); + return MUST(builder.to_string()); } } diff --git a/Tests/LibWeb/Text/expected/wpt-import/css/css-color/parsing/color-valid-lab.txt b/Tests/LibWeb/Text/expected/wpt-import/css/css-color/parsing/color-valid-lab.txt new file mode 100644 index 00000000000..de59a756bbf --- /dev/null +++ b/Tests/LibWeb/Text/expected/wpt-import/css/css-color/parsing/color-valid-lab.txt @@ -0,0 +1,156 @@ +Harness status: OK + +Found 150 tests + +70 Pass +80 Fail +Pass e.style['color'] = "lab(0 0 0)" should set the property value +Pass e.style['color'] = "lab(0 0 0 / 1)" should set the property value +Pass e.style['color'] = "lab(0 0 0 / 0.5)" should set the property value +Pass e.style['color'] = "lab(20 0 10/0.5)" should set the property value +Pass e.style['color'] = "lab(20 0 10/50%)" should set the property value +Pass e.style['color'] = "lab(400 0 10/50%)" should set the property value +Pass e.style['color'] = "lab(50 -160 160)" should set the property value +Pass e.style['color'] = "lab(50 -200 200)" should set the property value +Pass e.style['color'] = "lab(0 0 0 / -10%)" should set the property value +Pass e.style['color'] = "lab(0 0 0 / 110%)" should set the property value +Pass e.style['color'] = "lab(0 0 0 / 300%)" should set the property value +Pass e.style['color'] = "lab(-40 0 0)" should set the property value +Pass e.style['color'] = "lab(50 -20 0)" should set the property value +Pass e.style['color'] = "lab(50 0 -20)" should set the property value +Pass e.style['color'] = "lab(50% 50% -20%)" should set the property value +Pass e.style['color'] = "lab(50 -20% -20%)" should set the property value +Pass e.style['color'] = "lab(calc(50 * 3) calc(0.5 - 1) calc(1.5) / calc(-0.5 + 1))" should set the property value +Pass e.style['color'] = "lab(calc(-50 * 3) calc(0.5 + 1) calc(-1.5) / calc(-0.5 * 2))" should set the property value +Pass e.style['color'] = "lab(calc(50%) 50% 0.5)" should set the property value +Pass e.style['color'] = "lab(200 calc(50%) 0.5)" should set the property value +Pass e.style['color'] = "lab(-200 calc(50%) 0.5)" should set the property value +Pass e.style['color'] = "lab(none 20 calc(0.5))" should set the property value +Pass e.style['color'] = "lab(none none none / none)" should set the property value +Pass e.style['color'] = "lab(none none none)" should set the property value +Pass e.style['color'] = "lab(20 none none / none)" should set the property value +Pass e.style['color'] = "lab(none none none / 0.5)" should set the property value +Pass e.style['color'] = "lab(0 0 0 / none)" should set the property value +Pass e.style['color'] = "lab(calc(infinity) 0 0)" should set the property value +Pass e.style['color'] = "lab(50 calc(infinity) 0)" should set the property value +Pass e.style['color'] = "lab(50 calc(-infinity) 0)" should set the property value +Pass e.style['color'] = "lab(calc(NaN) 0 0)" should set the property value +Pass e.style['color'] = "lab(calc(0 / 0) 0 0)" should set the property value +Pass e.style['color'] = "oklab(0 0 0)" should set the property value +Pass e.style['color'] = "oklab(0 0 0 / 1)" should set the property value +Pass e.style['color'] = "oklab(0 0 0 / 0.5)" should set the property value +Pass e.style['color'] = "oklab(0.2 0 0.1/0.5)" should set the property value +Pass e.style['color'] = "oklab(0.2 0 0.1/50%)" should set the property value +Pass e.style['color'] = "oklab(4 0 0.1/50%)" should set the property value +Pass e.style['color'] = "oklab(0.5 -1.6 1.6)" should set the property value +Pass e.style['color'] = "oklab(0.5 -2 2)" should set the property value +Pass e.style['color'] = "oklab(0 0 0 / -10%)" should set the property value +Pass e.style['color'] = "oklab(0 0 0 / 110%)" should set the property value +Pass e.style['color'] = "oklab(0 0 0 / 300%)" should set the property value +Pass e.style['color'] = "oklab(-0.4 0 0)" should set the property value +Pass e.style['color'] = "oklab(0.5 -2 0)" should set the property value +Pass e.style['color'] = "oklab(0.5 0 -2)" should set the property value +Pass e.style['color'] = "oklab(50% 50% -20%)" should set the property value +Pass e.style['color'] = "oklab(0.5 -20% -20%)" should set the property value +Pass e.style['color'] = "oklab(calc(0.5 * 3) calc(0.5 - 1) calc(1.5) / calc(-0.5 + 1))" should set the property value +Pass e.style['color'] = "oklab(calc(-0.5 * 3) calc(0.5 + 1) calc(-1.5) / calc(-0.5 * 2))" should set the property value +Pass e.style['color'] = "oklab(calc(50%) 50% 0.5)" should set the property value +Pass e.style['color'] = "oklab(200 calc(50%) 0.5)" should set the property value +Pass e.style['color'] = "oklab(-200 calc(50%) 0.5)" should set the property value +Pass e.style['color'] = "oklab(none 0.2 calc(0.5))" should set the property value +Pass e.style['color'] = "oklab(none none none / none)" should set the property value +Pass e.style['color'] = "oklab(none none none)" should set the property value +Pass e.style['color'] = "oklab(0.2 none none / none)" should set the property value +Pass e.style['color'] = "oklab(none none none / 0.5)" should set the property value +Pass e.style['color'] = "oklab(0 0 0 / none)" should set the property value +Pass e.style['color'] = "lab(20% -50% 90%/0.5)" should set the property value +Pass e.style['color'] = "oklab(20% 70% -80%/0.5)" should set the property value +Pass e.style['color'] = "oklab(calc(infinity) 0 0)" should set the property value +Pass e.style['color'] = "oklab(0.5 calc(infinity) 0)" should set the property value +Pass e.style['color'] = "oklab(0.5 calc(-infinity) 0)" should set the property value +Pass e.style['color'] = "oklab(calc(NaN) 0 0)" should set the property value +Pass e.style['color'] = "oklab(calc(0 / 0) 0 0)" should set the property value +Fail e.style['color'] = "lch(0 0 0deg)" should set the property value +Fail e.style['color'] = "lch(0 0 0deg / 1)" should set the property value +Fail e.style['color'] = "lch(0 0 0deg / 0.5)" should set the property value +Fail e.style['color'] = "lch(100 230 0deg / 0.5)" should set the property value +Fail e.style['color'] = "lch(20 50 20deg/0.5)" should set the property value +Fail e.style['color'] = "lch(20 50 20deg/50%)" should set the property value +Fail e.style['color'] = "lch(10 20 20deg / -10%)" should set the property value +Fail e.style['color'] = "lch(10 20 20deg / 110%)" should set the property value +Fail e.style['color'] = "lch(10 20 1.28rad)" should set the property value +Fail e.style['color'] = "lch(10 20 380deg)" should set the property value +Fail e.style['color'] = "lch(10 20 -340deg)" should set the property value +Fail e.style['color'] = "lch(10 20 740deg)" should set the property value +Fail e.style['color'] = "lch(10 20 -700deg)" should set the property value +Fail e.style['color'] = "lch(-40 0 0)" should set the property value +Fail e.style['color'] = "lch(20 -20 0)" should set the property value +Fail e.style['color'] = "lch(0 0 0 / 0.5)" should set the property value +Fail e.style['color'] = "lch(10 20 20 / 110%)" should set the property value +Fail e.style['color'] = "lch(10 20 -700)" should set the property value +Fail e.style['color'] = "lch(50% 50% 20)" should set the property value +Fail e.style['color'] = "lch(0.5 -20% -20)" should set the property value +Fail e.style['color'] = "lch(calc(50 * 3) calc(0.5 - 1) calc(20deg * 2) / calc(-0.5 + 1))" should set the property value +Fail e.style['color'] = "lch(calc(-50 * 3) calc(0.5 + 1) calc(-20deg * 2) / calc(-0.5 * 2))" should set the property value +Fail e.style['color'] = "lch(calc(50%) 50% 0.5)" should set the property value +Fail e.style['color'] = "lch(200 calc(50%) 0.5)" should set the property value +Fail e.style['color'] = "lch(-200 calc(50%) 0.5)" should set the property value +Fail e.style['color'] = "lch(calc(50%) -100 0.5)" should set the property value +Fail e.style['color'] = "lch(none 20 calc(0.5))" should set the property value +Fail e.style['color'] = "lch(none none none / none)" should set the property value +Fail e.style['color'] = "lch(none none none)" should set the property value +Fail e.style['color'] = "lch(20 none none / none)" should set the property value +Fail e.style['color'] = "lch(none none none / 0.5)" should set the property value +Fail e.style['color'] = "lch(0 0 0 / none)" should set the property value +Fail e.style['color'] = "lch(calc(infinity) 0 0)" should set the property value +Fail e.style['color'] = "lch(50 calc(infinity) 0)" should set the property value +Fail e.style['color'] = "lch(50 calc(-infinity) 0)" should set the property value +Fail e.style['color'] = "lch(calc(NaN) 0 0)" should set the property value +Fail e.style['color'] = "lch(calc(0 / 0) 0 0)" should set the property value +Fail e.style['color'] = "oklch(0 0 0deg)" should set the property value +Fail e.style['color'] = "oklch(0 0 0deg / 1)" should set the property value +Fail e.style['color'] = "oklch(0 0 0deg / 0.5)" should set the property value +Fail e.style['color'] = "oklch(1 2.3 0deg / 0.5)" should set the property value +Fail e.style['color'] = "oklch(0.2 0.5 20deg/0.5)" should set the property value +Fail e.style['color'] = "oklch(0.2 0.5 20deg/50%)" should set the property value +Fail e.style['color'] = "oklch(0.1 0.2 20deg / -10%)" should set the property value +Fail e.style['color'] = "oklch(0.1 0.2 20deg / 110%)" should set the property value +Fail e.style['color'] = "oklch(0.1 0.2 1.28rad)" should set the property value +Fail e.style['color'] = "oklch(0.1 0.2 380deg)" should set the property value +Fail e.style['color'] = "oklch(0.1 0.2 -340deg)" should set the property value +Fail e.style['color'] = "oklch(0.1 0.2 740deg)" should set the property value +Fail e.style['color'] = "oklch(0.1 0.2 -700deg)" should set the property value +Fail e.style['color'] = "oklch(-4 0 0)" should set the property value +Fail e.style['color'] = "oklch(0.2 -0.2 0)" should set the property value +Fail e.style['color'] = "oklch(0 0 0 / 0.5)" should set the property value +Fail e.style['color'] = "oklch(0.1 0.2 20 / 110%)" should set the property value +Fail e.style['color'] = "oklch(0.1 0.2 -700)" should set the property value +Fail e.style['color'] = "oklch(50% 50% 20)" should set the property value +Fail e.style['color'] = "oklch(0.5 -20% -20)" should set the property value +Fail e.style['color'] = "oklch(calc(0.5 * 3) calc(0.5 - 1) calc(20deg * 2) / calc(-0.5 + 1))" should set the property value +Fail e.style['color'] = "oklch(calc(-0.5 * 3) calc(0.5 + 1) calc(-20deg * 2) / calc(-0.5 * 2))" should set the property value +Fail e.style['color'] = "oklch(calc(50%) 50% 0.5)" should set the property value +Fail e.style['color'] = "oklch(200 calc(50%) 0.5)" should set the property value +Fail e.style['color'] = "oklch(-200 calc(50%) 0.5)" should set the property value +Fail e.style['color'] = "oklch(calc(50%) -100 0.5)" should set the property value +Fail e.style['color'] = "oklch(none 0.2 calc(0.5))" should set the property value +Fail e.style['color'] = "oklch(none none none / none)" should set the property value +Fail e.style['color'] = "oklch(none none none)" should set the property value +Fail e.style['color'] = "oklch(0.2 none none / none)" should set the property value +Fail e.style['color'] = "oklch(none none none / 0.5)" should set the property value +Fail e.style['color'] = "oklch(0 0 0 / none)" should set the property value +Fail e.style['color'] = "lch(20% 80% 10/0.5)" should set the property value +Fail e.style['color'] = "oklch(20% 60% 10/0.5)" should set the property value +Fail e.style['color'] = "oklch(calc(infinity) 0 0)" should set the property value +Fail e.style['color'] = "oklch(0.5 calc(infinity) 0)" should set the property value +Fail e.style['color'] = "oklch(0.5 calc(-infinity) 0)" should set the property value +Fail e.style['color'] = "oklch(calc(NaN) 0 0)" should set the property value +Fail e.style['color'] = "oklch(calc(0 / 0) 0 0)" should set the property value +Pass e.style['color'] = "lab(calc(50 + (sign(1em - 10px) * 10)) 30 50 / 50%)" should set the property value +Pass e.style['color'] = "oklab(calc(0.5 + (sign(1em - 10px) * 0.1)) 0.3 0.5 / 50%)" should set the property value +Pass e.style['color'] = "lab(60 30 50 / calc(50% + (sign(1em - 10px) * 10%)))" should set the property value +Pass e.style['color'] = "oklab(0.6 0.3 0.5 / calc(50% + (sign(1em - 10px) * 10%)))" should set the property value +Fail e.style['color'] = "lch(calc(50 + (sign(1em - 10px) * 10)) 30 50deg / 50%)" should set the property value +Fail e.style['color'] = "oklch(calc(0.5 + (sign(1em - 10px) * 0.1)) 0.3 50deg / 50%)" should set the property value +Fail e.style['color'] = "lch(60 30 50deg / calc(50% + (sign(1em - 10px) * 10%)))" should set the property value +Fail e.style['color'] = "oklch(0.6 0.3 50deg / calc(50% + (sign(1em - 10px) * 10%)))" should set the property value \ No newline at end of file diff --git a/Tests/LibWeb/Text/input/wpt-import/css/css-color/parsing/color-valid-lab.html b/Tests/LibWeb/Text/input/wpt-import/css/css-color/parsing/color-valid-lab.html new file mode 100644 index 00000000000..81a42802286 --- /dev/null +++ b/Tests/LibWeb/Text/input/wpt-import/css/css-color/parsing/color-valid-lab.html @@ -0,0 +1,198 @@ + + + + +CSS Color Level 4: Parsing and serialization of colors using valid Lab notation + + + + + + + + + + + + +