LibWeb: Preserve auto in computed caret colors

Keep caret-color computed and used values separate so inherited auto
values resolve against each element's own currentColor.

Author: AtkinsSJ

Libraries/LibWeb/CSS/CSSStyleProperties.cpp

@@ -585,6 +585,8 @@ static void ensure_pseudo_element_style_for_cssom(DOM::AbstractElement abstract_
         abstract_element.element().set_computed_style(*pseudo_element, nullptr);
 }
 
+static RefPtr<StyleValue const> resolve_color_style_value(StyleValue const&, Color, Layout::NodeWithStyle const* = nullptr);
+
 Optional<StyleProperty> CSSStyleProperties::get_direct_property(PropertyNameAndID const& property_name_and_id) const
 {
     auto const property_id = property_name_and_id.id();
@@ -703,6 +705,8 @@ Optional<StyleProperty> CSSStyleProperties::get_direct_property(PropertyNameAndI
                         return style_value.release_nonnull();
                 }
                 auto computed_value = computed_values->computed_style_value(computed_property_id).release_nonnull();
+                if (computed_property_id == PropertyID::CaretColor)
+                    return resolve_color_style_value(*computed_value, computed_values->caret_color()).release_nonnull();
                 return computed_value;
             };
 
@@ -743,7 +747,7 @@ Optional<StyleProperty> CSSStyleProperties::get_direct_property(PropertyNameAndI
     return {};
 }
 
-static RefPtr<StyleValue const> resolve_color_style_value(StyleValue const& style_value, Color computed_color, Layout::NodeWithStyle const* layout_node = nullptr)
+static RefPtr<StyleValue const> resolve_color_style_value(StyleValue const& style_value, Color computed_color, Layout::NodeWithStyle const* layout_node)
 {
     if (layout_node && style_value.is_color_function()) {
         auto const& color_function = as<ColorFunctionStyleValue>(style_value);

Libraries/LibWeb/CSS/ComputedProperties.cpp

@@ -441,7 +441,7 @@ RefPtr<StyleValue const> ComputedValues::computed_style_value(PropertyID propert
             return m_noninherited.border_top_color_style_value;
         return color_style_value(border_top().color);
     case PropertyID::CaretColor:
-        return color_style_value(caret_color());
+        return color_or_auto_style_value(caret_color_value());
     case PropertyID::CaptionSide:
         return KeywordStyleValue::create(to_keyword(caption_side()));
     case PropertyID::ClipRule:

Libraries/LibWeb/CSS/ComputedValues.cpp

@@ -904,7 +904,12 @@ NonnullRefPtr<ComputedValues const> ComputedValues::create(ComputedProperties co
     computed_values.set_container_type(computed_style.container_type());
     computed_values.set_will_change(computed_style.will_change());
 
-    computed_values.set_caret_color(computed_style.caret_color(color_resolution_context));
+    auto const& caret_color_value = computed_style.property(CSS::PropertyID::CaretColor);
+    CSS::ColorOrAuto caret_color;
+    caret_color.used_value = computed_style.caret_color(color_resolution_context);
+    if (caret_color_value.to_keyword() != CSS::Keyword::Auto)
+        caret_color.computed_value = caret_color.used_value;
+    computed_values.set_caret_color(move(caret_color));
     computed_values.set_color_interpolation(computed_style.color_interpolation());
     computed_values.set_color_interpolation_filters(computed_style.color_interpolation_filters());
     computed_values.set_resize(computed_style.resize());

Libraries/LibWeb/CSS/ComputedValues.h

@@ -884,7 +884,8 @@ class WEB_API ComputedValues final : public RefCounted<ComputedValues> {
     CSSPixels border_spacing_horizontal() const { return m_inherited.border_spacing_horizontal; }
     CSSPixels border_spacing_vertical() const { return m_inherited.border_spacing_vertical; }
     CaptionSide caption_side() const { return m_inherited.caption_side; }
-    Color caret_color() const { return m_inherited.caret_color; }
+    ColorOrAuto const& caret_color_value() const { return m_inherited.caret_color; }
+    Color caret_color() const { return m_inherited.caret_color.used_value; }
     Clear clear() const { return m_noninherited.clear; }
     Clip clip() const { return m_noninherited.clip; }
     ColorInterpolation color_interpolation() const { return m_inherited.color_interpolation; }
@@ -1202,7 +1203,7 @@ class WEB_API ComputedValues final : public RefCounted<ComputedValues> {
     void inherit_from(ComputedValues const& other) { m_inherited = other.m_inherited; }
 
     struct InheritedValues {
-        Color caret_color { InitialValues::caret_color() };
+        ColorOrAuto caret_color;
         CSSPixels font_size { InitialValues::font_size() };
         RefPtr<Gfx::FontCascadeList const> font_list {};
         Vector<ComputedFontFamily> font_families { GenericFontFamily::Serif };
@@ -1532,7 +1533,7 @@ class ComputedValues::Mutator final {
     void set_animation_timelines(Vector<AnimationTimelineData> value) { m_values.m_noninherited.animation_timelines = move(value); }
     void set_animation_timing_functions(Vector<EasingFunction> value) { m_values.m_noninherited.animation_timing_functions = move(value); }
     void set_animation_timing_function_style_values(StyleValueVector value) { m_values.m_noninherited.animation_timing_function_style_values = move(value); }
-    void set_caret_color(Color caret_color) { m_values.m_inherited.caret_color = caret_color; }
+    void set_caret_color(ColorOrAuto caret_color) { m_values.m_inherited.caret_color = move(caret_color); }
     void set_font_list(NonnullRefPtr<Gfx::FontCascadeList const> font_list) { m_values.m_inherited.font_list = move(font_list); }
     void set_font_families(Vector<ComputedFontFamily> value) { m_values.m_inherited.font_families = move(value); }
     void set_font_size(CSSPixels font_size) { m_values.m_inherited.font_size = font_size; }

Tests/LibWeb/Text/expected/wpt-import/css/css-ui/caret-color-021.txt

@@ -2,5 +2,5 @@ Harness status: OK
 
 Found 1 tests
 
-1 Fail
-Fail	Default caret-color is not interpolable
+1 Pass
+Pass	Default caret-color is not interpolable