LibWeb/CSS: Rename color style value types

The typed-om classes will be separate.

Author: AtkinsSJ

Libraries/LibWeb/CMakeLists.txt

@@ -201,12 +201,6 @@ set(SOURCES
     CSS/StyleValues/ContentStyleValue.cpp
     CSS/StyleValues/CounterDefinitionsStyleValue.cpp
     CSS/StyleValues/CounterStyleValue.cpp
-    CSS/StyleValues/CSSHSL.cpp
-    CSS/StyleValues/CSSHWB.cpp
-    CSS/StyleValues/CSSLabLike.cpp
-    CSS/StyleValues/CSSLCHLike.cpp
-    CSS/StyleValues/CSSLightDark.cpp
-    CSS/StyleValues/CSSRGB.cpp
     CSS/StyleValues/CursorStyleValue.cpp
     CSS/StyleValues/DisplayStyleValue.cpp
     CSS/StyleValues/EasingStyleValue.cpp
@@ -218,15 +212,21 @@ set(SOURCES
     CSS/StyleValues/GridTemplateAreaStyleValue.cpp
     CSS/StyleValues/GridTrackPlacementStyleValue.cpp
     CSS/StyleValues/GridTrackSizeListStyleValue.cpp
+    CSS/StyleValues/HSLColorStyleValue.cpp
+    CSS/StyleValues/HWBColorStyleValue.cpp
     CSS/StyleValues/ImageStyleValue.cpp
     CSS/StyleValues/IntegerStyleValue.cpp
     CSS/StyleValues/KeywordStyleValue.cpp
+    CSS/StyleValues/LCHLikeColorStyleValue.cpp
+    CSS/StyleValues/LabLikeColorStyleValue.cpp
     CSS/StyleValues/LengthStyleValue.cpp
+    CSS/StyleValues/LightDarkStyleValue.cpp
     CSS/StyleValues/LinearGradientStyleValue.cpp
     CSS/StyleValues/MathDepthStyleValue.cpp
     CSS/StyleValues/NumberStyleValue.cpp
     CSS/StyleValues/OpenTypeTaggedStyleValue.cpp
     CSS/StyleValues/PositionStyleValue.cpp
+    CSS/StyleValues/RGBColorStyleValue.cpp
     CSS/StyleValues/RadialGradientStyleValue.cpp
     CSS/StyleValues/RectStyleValue.cpp
     CSS/StyleValues/RepeatStyleStyleValue.cpp

Libraries/LibWeb/CSS/Parser/ValueParsing.cpp

@@ -27,12 +27,6 @@
 #include <LibWeb/CSS/StyleValues/AngleStyleValue.h>
 #include <LibWeb/CSS/StyleValues/BackgroundSizeStyleValue.h>
 #include <LibWeb/CSS/StyleValues/BasicShapeStyleValue.h>
-#include <LibWeb/CSS/StyleValues/CSSHSL.h>
-#include <LibWeb/CSS/StyleValues/CSSHWB.h>
-#include <LibWeb/CSS/StyleValues/CSSLCHLike.h>
-#include <LibWeb/CSS/StyleValues/CSSLabLike.h>
-#include <LibWeb/CSS/StyleValues/CSSLightDark.h>
-#include <LibWeb/CSS/StyleValues/CSSRGB.h>
 #include <LibWeb/CSS/StyleValues/ColorFunctionStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ColorMixStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ColorStyleValue.h>
@@ -49,14 +43,20 @@
 #include <LibWeb/CSS/StyleValues/GridTrackPlacementStyleValue.h>
 #include <LibWeb/CSS/StyleValues/GridTrackSizeListStyleValue.h>
 #include <LibWeb/CSS/StyleValues/GuaranteedInvalidStyleValue.h>
+#include <LibWeb/CSS/StyleValues/HSLColorStyleValue.h>
+#include <LibWeb/CSS/StyleValues/HWBColorStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ImageStyleValue.h>
 #include <LibWeb/CSS/StyleValues/IntegerStyleValue.h>
 #include <LibWeb/CSS/StyleValues/KeywordStyleValue.h>
+#include <LibWeb/CSS/StyleValues/LCHLikeColorStyleValue.h>
+#include <LibWeb/CSS/StyleValues/LabLikeColorStyleValue.h>
 #include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
+#include <LibWeb/CSS/StyleValues/LightDarkStyleValue.h>
 #include <LibWeb/CSS/StyleValues/LinearGradientStyleValue.h>
 #include <LibWeb/CSS/StyleValues/NumberStyleValue.h>
 #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
 #include <LibWeb/CSS/StyleValues/PositionStyleValue.h>
+#include <LibWeb/CSS/StyleValues/RGBColorStyleValue.h>
 #include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
 #include <LibWeb/CSS/StyleValues/RatioStyleValue.h>
 #include <LibWeb/CSS/StyleValues/RectStyleValue.h>
@@ -1582,7 +1582,7 @@ RefPtr<StyleValue const> Parser::parse_rgb_color_value(TokenStream<ComponentValu
         alpha = NumberStyleValue::create(1);
 
     transaction.commit();
-    return CSSRGB::create(red.release_nonnull(), green.release_nonnull(), blue.release_nonnull(), alpha.release_nonnull(), legacy_syntax ? ColorSyntax::Legacy : ColorSyntax::Modern);
+    return RGBColorStyleValue::create(red.release_nonnull(), green.release_nonnull(), blue.release_nonnull(), alpha.release_nonnull(), legacy_syntax ? ColorSyntax::Legacy : ColorSyntax::Modern);
 }
 
 // https://www.w3.org/TR/css-color-4/#funcdef-hsl
@@ -1694,7 +1694,7 @@ RefPtr<StyleValue const> Parser::parse_hsl_color_value(TokenStream<ComponentValu
         alpha = NumberStyleValue::create(1);
 
     transaction.commit();
-    return CSSHSL::create(h.release_nonnull(), s.release_nonnull(), l.release_nonnull(), alpha.release_nonnull(), legacy_syntax ? ColorSyntax::Legacy : ColorSyntax::Modern);
+    return HSLColorStyleValue::create(h.release_nonnull(), s.release_nonnull(), l.release_nonnull(), alpha.release_nonnull(), legacy_syntax ? ColorSyntax::Legacy : ColorSyntax::Modern);
 }
 
 // https://www.w3.org/TR/css-color-4/#funcdef-hwb
@@ -1748,7 +1748,7 @@ RefPtr<StyleValue const> Parser::parse_hwb_color_value(TokenStream<ComponentValu
         alpha = NumberStyleValue::create(1);
 
     transaction.commit();
-    return CSSHWB::create(h.release_nonnull(), w.release_nonnull(), b.release_nonnull(), alpha.release_nonnull());
+    return HWBColorStyleValue::create(h.release_nonnull(), w.release_nonnull(), b.release_nonnull(), alpha.release_nonnull());
 }
 
 Optional<Array<RefPtr<StyleValue const>, 4>> Parser::parse_lab_like_color_value(TokenStream<ComponentValue>& outer_tokens, StringView function_name)
@@ -1817,7 +1817,7 @@ RefPtr<StyleValue const> Parser::parse_lab_color_value(TokenStream<ComponentValu
 
     auto& color_values = *maybe_color_values;
 
-    return CSSLabLike::create<CSSLab>(color_values[0].release_nonnull(),
+    return LabLikeColorStyleValue::create<LabColorStyleValue>(color_values[0].release_nonnull(),
         color_values[1].release_nonnull(),
         color_values[2].release_nonnull(),
         color_values[3].release_nonnull());
@@ -1837,7 +1837,7 @@ RefPtr<StyleValue const> Parser::parse_oklab_color_value(TokenStream<ComponentVa
 
     auto& color_values = *maybe_color_values;
 
-    return CSSLabLike::create<CSSOKLab>(color_values[0].release_nonnull(),
+    return LabLikeColorStyleValue::create<OKLabColorStyleValue>(color_values[0].release_nonnull(),
         color_values[1].release_nonnull(),
         color_values[2].release_nonnull(),
         color_values[3].release_nonnull());
@@ -1905,7 +1905,7 @@ RefPtr<StyleValue const> Parser::parse_lch_color_value(TokenStream<ComponentValu
 
     auto& color_values = *maybe_color_values;
 
-    return CSSLCHLike::create<CSSLCH>(color_values[0].release_nonnull(),
+    return LCHLikeColorStyleValue::create<LCHColorStyleValue>(color_values[0].release_nonnull(),
         color_values[1].release_nonnull(),
         color_values[2].release_nonnull(),
         color_values[3].release_nonnull());
@@ -1925,7 +1925,7 @@ RefPtr<StyleValue const> Parser::parse_oklch_color_value(TokenStream<ComponentVa
 
     auto& color_values = *maybe_color_values;
 
-    return CSSLCHLike::create<CSSOKLCH>(color_values[0].release_nonnull(),
+    return LCHLikeColorStyleValue::create<OKLCHColorStyleValue>(color_values[0].release_nonnull(),
         color_values[1].release_nonnull(),
         color_values[2].release_nonnull(),
         color_values[3].release_nonnull());
@@ -2156,7 +2156,7 @@ RefPtr<StyleValue const> Parser::parse_light_dark_color_value(TokenStream<Compon
         return {};
 
     transaction.commit();
-    return CSSLightDark::create(light.release_nonnull(), dark.release_nonnull());
+    return LightDarkStyleValue::create(light.release_nonnull(), dark.release_nonnull());
 }
 
 // https://www.w3.org/TR/css-color-4/#color-syntax

Libraries/LibWeb/CSS/StyleValues/ColorStyleValue.cpp

@@ -11,17 +11,17 @@
 #include <LibJS/Runtime/AbstractOperations.h>
 #include <LibWeb/CSS/Serialize.h>
 #include <LibWeb/CSS/StyleValues/AngleStyleValue.h>
-#include <LibWeb/CSS/StyleValues/CSSRGB.h>
 #include <LibWeb/CSS/StyleValues/CalculatedStyleValue.h>
 #include <LibWeb/CSS/StyleValues/KeywordStyleValue.h>
 #include <LibWeb/CSS/StyleValues/NumberStyleValue.h>
 #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
+#include <LibWeb/CSS/StyleValues/RGBColorStyleValue.h>
 
 namespace Web::CSS {
 
 ValueComparingNonnullRefPtr<ColorStyleValue const> ColorStyleValue::create_from_color(Color color, ColorSyntax color_syntax, Optional<FlyString> name)
 {
-    return CSSRGB::create(
+    return RGBColorStyleValue::create(
         NumberStyleValue::create(color.red()),
         NumberStyleValue::create(color.green()),
         NumberStyleValue::create(color.blue()),

Libraries/LibWeb/CSS/StyleValues/ColorStyleValue.h

@@ -28,7 +28,7 @@ class ColorStyleValue : public StyleValue {
     virtual bool has_color() const override { return true; }
 
     enum class ColorType {
-        RGB, // This is used by CSSRGB for rgb(...) and rgba(...).
+        RGB, // This is used by RGBColorStyleValue for rgb(...) and rgba(...).
         A98RGB,
         DisplayP3,
         HSL,
@@ -37,13 +37,13 @@ class ColorStyleValue : public StyleValue {
         LCH,
         OKLab,
         OKLCH,
-        sRGB, // This is used by CSSColor for color(srgb ...).
+        sRGB, // This is used by ColorFunctionStyleValue for color(srgb ...).
         sRGBLinear,
         ProPhotoRGB,
         Rec2020,
         XYZD50,
         XYZD65,
-        LightDark, // This is used by CSSLightDark for light-dark(..., ...).
+        LightDark, // This is used by LightDarkStyleValue for light-dark(..., ...).
         ColorMix,
     };
     ColorType color_type() const { return m_color_type; }

Libraries/LibWeb/CSS/StyleValues/CSSHSL.cpp renamed to Libraries/LibWeb/CSS/StyleValues/HSLColorStyleValue.cpp

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "CSSHSL.h"
+#include "HSLColorStyleValue.h"
 #include <AK/TypeCasts.h>
 #include <LibWeb/CSS/Serialize.h>
 #include <LibWeb/CSS/StyleValues/CalculatedStyleValue.h>
 #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
 
 namespace Web::CSS {
 
-Optional<Color> CSSHSL::to_color(ColorResolutionContext color_resolution_context) const
+Optional<Color> HSLColorStyleValue::to_color(ColorResolutionContext color_resolution_context) const
 {
     auto h_val = resolve_hue(m_properties.h, color_resolution_context.calculation_resolution_context);
     auto s_val = resolve_with_reference_value(m_properties.s, 100.0, color_resolution_context.calculation_resolution_context);
@@ -25,19 +25,19 @@ Optional<Color> CSSHSL::to_color(ColorResolutionContext color_resolution_context
     return Color::from_hsla(h_val.value(), s_val.value() / 100.0f, l_val.value() / 100.0f, alpha_val.value());
 }
 
-bool CSSHSL::equals(StyleValue const& other) const
+bool HSLColorStyleValue::equals(StyleValue const& other) const
 {
     if (type() != other.type())
         return false;
     auto const& other_color = other.as_color();
     if (color_type() != other_color.color_type())
         return false;
-    auto const& other_hsl = as<CSSHSL>(other_color);
+    auto const& other_hsl = as<HSLColorStyleValue>(other_color);
     return m_properties == other_hsl.m_properties;
 }
 
 // https://www.w3.org/TR/css-color-4/#serializing-sRGB-values
-String CSSHSL::to_string(SerializationMode mode) const
+String HSLColorStyleValue::to_string(SerializationMode mode) const
 {
     if (auto color = to_color({}); color.has_value())
         return serialize_a_srgb_value(color.value());

Libraries/LibWeb/CSS/StyleValues/CSSHSL.h renamed to Libraries/LibWeb/CSS/StyleValues/HSLColorStyleValue.h

@@ -11,18 +11,17 @@
 
 namespace Web::CSS {
 
-// https://drafts.css-houdini.org/css-typed-om-1/#csshsl
-class CSSHSL final : public ColorStyleValue {
+class HSLColorStyleValue final : public ColorStyleValue {
 public:
-    static ValueComparingNonnullRefPtr<CSSHSL const> create(ValueComparingNonnullRefPtr<StyleValue const> h, ValueComparingNonnullRefPtr<StyleValue const> s, ValueComparingNonnullRefPtr<StyleValue const> l, ValueComparingRefPtr<StyleValue const> alpha, ColorSyntax color_syntax)
+    static ValueComparingNonnullRefPtr<HSLColorStyleValue const> create(ValueComparingNonnullRefPtr<StyleValue const> h, ValueComparingNonnullRefPtr<StyleValue const> s, ValueComparingNonnullRefPtr<StyleValue const> l, ValueComparingRefPtr<StyleValue const> alpha, ColorSyntax color_syntax)
     {
         // alpha defaults to 1
         if (!alpha)
-            return adopt_ref(*new (nothrow) CSSHSL(move(h), move(s), move(l), NumberStyleValue::create(1), color_syntax));
+            return adopt_ref(*new (nothrow) HSLColorStyleValue(move(h), move(s), move(l), NumberStyleValue::create(1), color_syntax));
 
-        return adopt_ref(*new (nothrow) CSSHSL(move(h), move(s), move(l), alpha.release_nonnull(), color_syntax));
+        return adopt_ref(*new (nothrow) HSLColorStyleValue(move(h), move(s), move(l), alpha.release_nonnull(), color_syntax));
     }
-    virtual ~CSSHSL() override = default;
+    virtual ~HSLColorStyleValue() override = default;
 
     StyleValue const& h() const { return *m_properties.h; }
     StyleValue const& s() const { return *m_properties.s; }
@@ -36,7 +35,7 @@ class CSSHSL final : public ColorStyleValue {
     virtual bool equals(StyleValue const& other) const override;
 
 private:
-    CSSHSL(ValueComparingNonnullRefPtr<StyleValue const> h, ValueComparingNonnullRefPtr<StyleValue const> s, ValueComparingNonnullRefPtr<StyleValue const> l, ValueComparingNonnullRefPtr<StyleValue const> alpha, ColorSyntax color_syntax)
+    HSLColorStyleValue(ValueComparingNonnullRefPtr<StyleValue const> h, ValueComparingNonnullRefPtr<StyleValue const> s, ValueComparingNonnullRefPtr<StyleValue const> l, ValueComparingNonnullRefPtr<StyleValue const> alpha, ColorSyntax color_syntax)
         : ColorStyleValue(ColorType::HSL, color_syntax)
         , m_properties { .h = move(h), .s = move(s), .l = move(l), .alpha = move(alpha) }
     {

Libraries/LibWeb/CSS/StyleValues/CSSHWB.cpp renamed to Libraries/LibWeb/CSS/StyleValues/HWBColorStyleValue.cpp

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "CSSHWB.h"
+#include "HWBColorStyleValue.h"
 #include <AK/TypeCasts.h>
 #include <LibWeb/CSS/Serialize.h>
 #include <LibWeb/CSS/StyleValues/CalculatedStyleValue.h>
 #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
 
 namespace Web::CSS {
 
-Optional<Color> CSSHWB::to_color(ColorResolutionContext color_resolution_context) const
+Optional<Color> HWBColorStyleValue::to_color(ColorResolutionContext color_resolution_context) const
 {
     auto h_val = resolve_hue(m_properties.h, color_resolution_context.calculation_resolution_context);
     auto raw_w_value = resolve_with_reference_value(m_properties.w, 100.0, color_resolution_context.calculation_resolution_context);
@@ -38,19 +38,19 @@ Optional<Color> CSSHWB::to_color(ColorResolutionContext color_resolution_context
     return Color::from_hsv(h_val.value(), saturation, value).with_opacity(alpha_val.value());
 }
 
-bool CSSHWB::equals(StyleValue const& other) const
+bool HWBColorStyleValue::equals(StyleValue const& other) const
 {
     if (type() != other.type())
         return false;
     auto const& other_color = other.as_color();
     if (color_type() != other_color.color_type())
         return false;
-    auto const& other_hwb = as<CSSHWB>(other_color);
+    auto const& other_hwb = as<HWBColorStyleValue>(other_color);
     return m_properties == other_hwb.m_properties;
 }
 
 // https://www.w3.org/TR/css-color-4/#serializing-sRGB-values
-String CSSHWB::to_string(SerializationMode mode) const
+String HWBColorStyleValue::to_string(SerializationMode mode) const
 {
     if (auto color = to_color({}); color.has_value())
         return serialize_a_srgb_value(color.value());

Libraries/LibWeb/CSS/StyleValues/CSSHWB.h renamed to Libraries/LibWeb/CSS/StyleValues/HWBColorStyleValue.h

@@ -11,18 +11,17 @@
 
 namespace Web::CSS {
 
-// https://drafts.css-houdini.org/css-typed-om-1/#csshwb
-class CSSHWB final : public ColorStyleValue {
+class HWBColorStyleValue final : public ColorStyleValue {
 public:
-    static ValueComparingNonnullRefPtr<CSSHWB const> create(ValueComparingNonnullRefPtr<StyleValue const> h, ValueComparingNonnullRefPtr<StyleValue const> w, ValueComparingNonnullRefPtr<StyleValue const> b, ValueComparingRefPtr<StyleValue const> alpha = {})
+    static ValueComparingNonnullRefPtr<HWBColorStyleValue const> create(ValueComparingNonnullRefPtr<StyleValue const> h, ValueComparingNonnullRefPtr<StyleValue const> w, ValueComparingNonnullRefPtr<StyleValue const> b, ValueComparingRefPtr<StyleValue const> alpha = {})
     {
         // alpha defaults to 1
         if (!alpha)
-            return adopt_ref(*new (nothrow) CSSHWB(move(h), move(w), move(b), NumberStyleValue::create(1)));
+            return adopt_ref(*new (nothrow) HWBColorStyleValue(move(h), move(w), move(b), NumberStyleValue::create(1)));
 
-        return adopt_ref(*new (nothrow) CSSHWB(move(h), move(w), move(b), alpha.release_nonnull()));
+        return adopt_ref(*new (nothrow) HWBColorStyleValue(move(h), move(w), move(b), alpha.release_nonnull()));
     }
-    virtual ~CSSHWB() override = default;
+    virtual ~HWBColorStyleValue() override = default;
 
     StyleValue const& h() const { return *m_properties.h; }
     StyleValue const& w() const { return *m_properties.w; }
@@ -36,7 +35,7 @@ class CSSHWB final : public ColorStyleValue {
     virtual bool equals(StyleValue const& other) const override;
 
 private:
-    CSSHWB(ValueComparingNonnullRefPtr<StyleValue const> h, ValueComparingNonnullRefPtr<StyleValue const> w, ValueComparingNonnullRefPtr<StyleValue const> b, ValueComparingNonnullRefPtr<StyleValue const> alpha)
+    HWBColorStyleValue(ValueComparingNonnullRefPtr<StyleValue const> h, ValueComparingNonnullRefPtr<StyleValue const> w, ValueComparingNonnullRefPtr<StyleValue const> b, ValueComparingNonnullRefPtr<StyleValue const> alpha)
         : ColorStyleValue(ColorType::HWB, ColorSyntax::Modern)
         , m_properties { .h = move(h), .w = move(w), .b = move(b), .alpha = move(alpha) }
     {

Libraries/LibWeb/CSS/StyleValues/CSSLCHLike.cpp renamed to Libraries/LibWeb/CSS/StyleValues/LCHLikeColorStyleValue.cpp

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "CSSLCHLike.h"
+#include "LCHLikeColorStyleValue.h"
 #include <AK/Math.h>
 #include <AK/TypeCasts.h>
 #include <LibWeb/CSS/Serialize.h>
@@ -16,18 +16,18 @@
 
 namespace Web::CSS {
 
-bool CSSLCHLike::equals(StyleValue const& other) const
+bool LCHLikeColorStyleValue::equals(StyleValue const& other) const
 {
     if (type() != other.type())
         return false;
     auto const& other_color = other.as_color();
     if (color_type() != other_color.color_type())
         return false;
-    auto const& other_oklch_like = as<CSSLCHLike>(other_color);
+    auto const& other_oklch_like = as<LCHLikeColorStyleValue>(other_color);
     return m_properties == other_oklch_like.m_properties;
 }
 
-Optional<Color> CSSLCH::to_color(ColorResolutionContext color_resolution_context) const
+Optional<Color> LCHColorStyleValue::to_color(ColorResolutionContext color_resolution_context) const
 {
     auto raw_l_val = resolve_with_reference_value(m_properties.l, 100, color_resolution_context.calculation_resolution_context);
     auto c_val = resolve_with_reference_value(m_properties.c, 150, color_resolution_context.calculation_resolution_context);
@@ -44,7 +44,7 @@ Optional<Color> CSSLCH::to_color(ColorResolutionContext color_resolution_context
 }
 
 // https://www.w3.org/TR/css-color-4/#serializing-lab-lch
-String CSSLCH::to_string(SerializationMode mode) const
+String LCHColorStyleValue::to_string(SerializationMode mode) const
 {
     StringBuilder builder;
     builder.append("lch("sv);
@@ -63,7 +63,7 @@ String CSSLCH::to_string(SerializationMode mode) const
     return MUST(builder.to_string());
 }
 
-Optional<Color> CSSOKLCH::to_color(ColorResolutionContext color_resolution_context) const
+Optional<Color> OKLCHColorStyleValue::to_color(ColorResolutionContext color_resolution_context) const
 {
     auto raw_l_val = resolve_with_reference_value(m_properties.l, 1.0, color_resolution_context.calculation_resolution_context);
     auto raw_c_val = resolve_with_reference_value(m_properties.c, 0.4, color_resolution_context.calculation_resolution_context);
@@ -81,7 +81,7 @@ Optional<Color> CSSOKLCH::to_color(ColorResolutionContext color_resolution_conte
 }
 
 // https://www.w3.org/TR/css-color-4/#serializing-oklab-oklch
-String CSSOKLCH::to_string(SerializationMode mode) const
+String OKLCHColorStyleValue::to_string(SerializationMode mode) const
 {
     StringBuilder builder;
     builder.append("oklch("sv);