LibWeb: Split ShadowStyleValue out of StyleValue.{h,cpp}

Userland/Libraries/LibWeb/CMakeLists.txt

@@ -92,6 +92,7 @@ set(SOURCES
     CSS/StyleValues/OverflowStyleValue.cpp
     CSS/StyleValues/PositionStyleValue.cpp
     CSS/StyleValues/RadialGradientStyleValue.cpp
+    CSS/StyleValues/ShadowStyleValue.cpp
     CSS/Supports.cpp
     CSS/SyntaxHighlighter/SyntaxHighlighter.cpp
     CSS/Time.cpp

Userland/Libraries/LibWeb/CSS/ComputedValues.h

@@ -13,6 +13,7 @@
 #include <LibWeb/CSS/Size.h>
 #include <LibWeb/CSS/StyleValue.h>
 #include <LibWeb/CSS/StyleValues/AbstractImageStyleValue.h>
+#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
 
 namespace Web::CSS {
 

Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp

@@ -62,6 +62,7 @@
 #include <LibWeb/CSS/StyleValues/PositionStyleValue.h>
 #include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ResolutionStyleValue.h>
+#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Dump.h>
 #include <LibWeb/Infra/Strings.h>

Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp

@@ -28,6 +28,7 @@
 #include <LibWeb/CSS/StyleValues/NumericStyleValue.h>
 #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
 #include <LibWeb/CSS/StyleValues/PositionStyleValue.h>
+#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/Layout/Viewport.h>

Userland/Libraries/LibWeb/CSS/StyleProperties.cpp

@@ -15,6 +15,7 @@
 #include <LibWeb/CSS/StyleValues/GridTrackPlacementStyleValue.h>
 #include <LibWeb/CSS/StyleValues/GridTrackSizeStyleValue.h>
 #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
+#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
 #include <LibWeb/FontCache.h>
 #include <LibWeb/Layout/BlockContainer.h>
 #include <LibWeb/Layout/Node.h>

Userland/Libraries/LibWeb/CSS/StyleValue.cpp

@@ -45,6 +45,7 @@
 #include <LibWeb/CSS/StyleValues/PositionStyleValue.h>
 #include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ResolutionStyleValue.h>
+#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/Loader/LoadRequest.h>
@@ -1146,15 +1147,6 @@ ErrorOr<String> RectStyleValue::to_string() const
     return String::formatted("rect({} {} {} {})", m_rect.top_edge, m_rect.right_edge, m_rect.bottom_edge, m_rect.left_edge);
 }
 
-ErrorOr<String> ShadowStyleValue::to_string() const
-{
-    StringBuilder builder;
-    TRY(builder.try_appendff("{} {} {} {} {}", m_properties.color.to_deprecated_string(), TRY(m_properties.offset_x.to_string()), TRY(m_properties.offset_y.to_string()), TRY(m_properties.blur_radius.to_string()), TRY(m_properties.spread_distance.to_string())));
-    if (m_properties.placement == ShadowPlacement::Inner)
-        TRY(builder.try_append(" inset"sv));
-    return builder.to_string();
-}
-
 ErrorOr<String> TextDecorationStyleValue::to_string() const
 {
     return String::formatted("{} {} {} {}", TRY(m_properties.line->to_string()), TRY(m_properties.thickness->to_string()), TRY(m_properties.style->to_string()), TRY(m_properties.color->to_string()));
@@ -1246,15 +1238,6 @@ ValueComparingNonnullRefPtr<StyleValue const> StyleValue::absolutized(CSSPixelRe
     return *this;
 }
 
-ValueComparingNonnullRefPtr<StyleValue const> ShadowStyleValue::absolutized(CSSPixelRect const& viewport_rect, Gfx::FontPixelMetrics const& font_metrics, CSSPixels font_size, CSSPixels root_font_size, CSSPixels line_height, CSSPixels root_line_height) const
-{
-    auto absolutized_offset_x = absolutized_length(m_properties.offset_x, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.offset_x);
-    auto absolutized_offset_y = absolutized_length(m_properties.offset_y, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.offset_y);
-    auto absolutized_blur_radius = absolutized_length(m_properties.blur_radius, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.blur_radius);
-    auto absolutized_spread_distance = absolutized_length(m_properties.spread_distance, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.spread_distance);
-    return ShadowStyleValue::create(m_properties.color, absolutized_offset_x, absolutized_offset_y, absolutized_blur_radius, absolutized_spread_distance, m_properties.placement);
-}
-
 bool CalculatedStyleValue::contains_percentage() const
 {
     return m_expression->contains_percentage();

Userland/Libraries/LibWeb/CSS/StyleValue.h

@@ -52,11 +52,6 @@ enum class BackgroundSize {
     LengthPercentage,
 };
 
-enum class ShadowPlacement {
-    Outer,
-    Inner,
-};
-
 enum class FlexBasis {
     Content,
     LengthPercentage,
@@ -627,46 +622,6 @@ private:
     NonnullOwnPtr<CalcSum> m_expression;
 };
 
-class ShadowStyleValue final : public StyleValueWithDefaultOperators<ShadowStyleValue> {
-public:
-    static ValueComparingNonnullRefPtr<ShadowStyleValue>
-    create(Color color, Length const& offset_x, Length const& offset_y, Length const& blur_radius, Length const& spread_distance, ShadowPlacement placement)
-    {
-        return adopt_ref(*new ShadowStyleValue(color, offset_x, offset_y, blur_radius, spread_distance, placement));
-    }
-    virtual ~ShadowStyleValue() override = default;
-
-    Color color() const { return m_properties.color; }
-    Length const& offset_x() const { return m_properties.offset_x; }
-    Length const& offset_y() const { return m_properties.offset_y; }
-    Length const& blur_radius() const { return m_properties.blur_radius; }
-    Length const& spread_distance() const { return m_properties.spread_distance; }
-    ShadowPlacement placement() const { return m_properties.placement; }
-
-    virtual ErrorOr<String> to_string() const override;
-
-    bool properties_equal(ShadowStyleValue const& other) const { return m_properties == other.m_properties; }
-
-private:
-    explicit ShadowStyleValue(Color color, Length const& offset_x, Length const& offset_y, Length const& blur_radius, Length const& spread_distance, ShadowPlacement placement)
-        : StyleValueWithDefaultOperators(Type::Shadow)
-        , m_properties { .color = color, .offset_x = offset_x, .offset_y = offset_y, .blur_radius = blur_radius, .spread_distance = spread_distance, .placement = placement }
-    {
-    }
-
-    virtual ValueComparingNonnullRefPtr<StyleValue const> absolutized(CSSPixelRect const& viewport_rect, Gfx::FontPixelMetrics const& font_metrics, CSSPixels font_size, CSSPixels root_font_size, CSSPixels line_height, CSSPixels root_line_height) const override;
-
-    struct Properties {
-        Color color;
-        Length offset_x;
-        Length offset_y;
-        Length blur_radius;
-        Length spread_distance;
-        ShadowPlacement placement;
-        bool operator==(Properties const&) const = default;
-    } m_properties;
-};
-
 class StringStyleValue : public StyleValueWithDefaultOperators<StringStyleValue> {
 public:
     static ValueComparingNonnullRefPtr<StringStyleValue> create(String const& string)

Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.cpp

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
+ * Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org>
+ * Copyright (c) 2022-2023, MacDue <macdue@dueutil.tech>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include "ShadowStyleValue.h"
+
+namespace Web::CSS {
+
+ErrorOr<String> ShadowStyleValue::to_string() const
+{
+    StringBuilder builder;
+    TRY(builder.try_appendff("{} {} {} {} {}", m_properties.color.to_deprecated_string(), TRY(m_properties.offset_x.to_string()), TRY(m_properties.offset_y.to_string()), TRY(m_properties.blur_radius.to_string()), TRY(m_properties.spread_distance.to_string())));
+    if (m_properties.placement == ShadowPlacement::Inner)
+        TRY(builder.try_append(" inset"sv));
+    return builder.to_string();
+}
+
+ValueComparingNonnullRefPtr<StyleValue const> ShadowStyleValue::absolutized(CSSPixelRect const& viewport_rect, Gfx::FontPixelMetrics const& font_metrics, CSSPixels font_size, CSSPixels root_font_size, CSSPixels line_height, CSSPixels root_line_height) const
+{
+    auto absolutized_offset_x = absolutized_length(m_properties.offset_x, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.offset_x);
+    auto absolutized_offset_y = absolutized_length(m_properties.offset_y, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.offset_y);
+    auto absolutized_blur_radius = absolutized_length(m_properties.blur_radius, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.blur_radius);
+    auto absolutized_spread_distance = absolutized_length(m_properties.spread_distance, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.spread_distance);
+    return ShadowStyleValue::create(m_properties.color, absolutized_offset_x, absolutized_offset_y, absolutized_blur_radius, absolutized_spread_distance, m_properties.placement);
+}
+
+}

Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.h

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
+ * Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org>
+ * Copyright (c) 2022-2023, MacDue <macdue@dueutil.tech>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <LibGfx/Color.h>
+#include <LibWeb/CSS/Length.h>
+#include <LibWeb/CSS/StyleValue.h>
+
+namespace Web::CSS {
+
+enum class ShadowPlacement {
+    Outer,
+    Inner,
+};
+
+class ShadowStyleValue final : public StyleValueWithDefaultOperators<ShadowStyleValue> {
+public:
+    static ValueComparingNonnullRefPtr<ShadowStyleValue> create(Color color, Length const& offset_x, Length const& offset_y, Length const& blur_radius, Length const& spread_distance, ShadowPlacement placement)
+    {
+        return adopt_ref(*new ShadowStyleValue(color, offset_x, offset_y, blur_radius, spread_distance, placement));
+    }
+    virtual ~ShadowStyleValue() override = default;
+
+    Color color() const { return m_properties.color; }
+    Length const& offset_x() const { return m_properties.offset_x; }
+    Length const& offset_y() const { return m_properties.offset_y; }
+    Length const& blur_radius() const { return m_properties.blur_radius; }
+    Length const& spread_distance() const { return m_properties.spread_distance; }
+    ShadowPlacement placement() const { return m_properties.placement; }
+
+    virtual ErrorOr<String> to_string() const override;
+
+    bool properties_equal(ShadowStyleValue const& other) const { return m_properties == other.m_properties; }
+
+private:
+    explicit ShadowStyleValue(Color color, Length const& offset_x, Length const& offset_y, Length const& blur_radius, Length const& spread_distance, ShadowPlacement placement)
+        : StyleValueWithDefaultOperators(Type::Shadow)
+        , m_properties { .color = color, .offset_x = offset_x, .offset_y = offset_y, .blur_radius = blur_radius, .spread_distance = spread_distance, .placement = placement }
+    {
+    }
+
+    virtual ValueComparingNonnullRefPtr<StyleValue const> absolutized(CSSPixelRect const& viewport_rect, Gfx::FontPixelMetrics const& font_metrics, CSSPixels font_size, CSSPixels root_font_size, CSSPixels line_height, CSSPixels root_line_height) const override;
+
+    struct Properties {
+        Color color;
+        Length offset_x;
+        Length offset_y;
+        Length blur_radius;
+        Length spread_distance;
+        ShadowPlacement placement;
+        bool operator==(Properties const&) const = default;
+    } m_properties;
+};
+
+}