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

Userland/Libraries/LibWeb/CMakeLists.txt

@@ -87,6 +87,7 @@ set(SOURCES
     CSS/StyleValues/ImageStyleValue.cpp
     CSS/StyleValues/LengthStyleValue.cpp
     CSS/StyleValues/LinearGradientStyleValue.cpp
+    CSS/StyleValues/ListStyleStyleValue.cpp
     CSS/StyleValues/RadialGradientStyleValue.cpp
     CSS/Supports.cpp
     CSS/SyntaxHighlighter/SyntaxHighlighter.cpp

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

@@ -55,6 +55,7 @@
 #include <LibWeb/CSS/StyleValues/InitialStyleValue.h>
 #include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
 #include <LibWeb/CSS/StyleValues/LinearGradientStyleValue.h>
+#include <LibWeb/CSS/StyleValues/ListStyleStyleValue.h>
 #include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Dump.h>

Userland/Libraries/LibWeb/CSS/StyleComputer.cpp

@@ -39,6 +39,7 @@
 #include <LibWeb/CSS/StyleValues/GridTrackPlacementStyleValue.h>
 #include <LibWeb/CSS/StyleValues/IdentifierStyleValue.h>
 #include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
+#include <LibWeb/CSS/StyleValues/ListStyleStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/FontCache.h>

Userland/Libraries/LibWeb/CSS/StyleValue.cpp

@@ -38,6 +38,7 @@
 #include <LibWeb/CSS/StyleValues/InitialStyleValue.h>
 #include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
 #include <LibWeb/CSS/StyleValues/LinearGradientStyleValue.h>
+#include <LibWeb/CSS/StyleValues/ListStyleStyleValue.h>
 #include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/BrowsingContext.h>
@@ -1135,11 +1136,6 @@ ErrorOr<void> PositionValue::serialize(StringBuilder& builder) const
     return {};
 }
 
-ErrorOr<String> ListStyleStyleValue::to_string() const
-{
-    return String::formatted("{} {} {}", TRY(m_properties.position->to_string()), TRY(m_properties.image->to_string()), TRY(m_properties.style_type->to_string()));
-}
-
 ErrorOr<String> NumericStyleValue::to_string() const
 {
     return m_value.visit(

Userland/Libraries/LibWeb/CSS/StyleValue.h

@@ -627,43 +627,6 @@ private:
     NonnullOwnPtr<CalcSum> m_expression;
 };
 
-class ListStyleStyleValue final : public StyleValueWithDefaultOperators<ListStyleStyleValue> {
-public:
-    static ValueComparingNonnullRefPtr<ListStyleStyleValue> create(
-        ValueComparingNonnullRefPtr<StyleValue> position,
-        ValueComparingNonnullRefPtr<StyleValue> image,
-        ValueComparingNonnullRefPtr<StyleValue> style_type)
-    {
-        return adopt_ref(*new ListStyleStyleValue(move(position), move(image), move(style_type)));
-    }
-    virtual ~ListStyleStyleValue() override = default;
-
-    ValueComparingNonnullRefPtr<StyleValue> position() const { return m_properties.position; }
-    ValueComparingNonnullRefPtr<StyleValue> image() const { return m_properties.image; }
-    ValueComparingNonnullRefPtr<StyleValue> style_type() const { return m_properties.style_type; }
-
-    virtual ErrorOr<String> to_string() const override;
-
-    bool properties_equal(ListStyleStyleValue const& other) const { return m_properties == other.m_properties; }
-
-private:
-    ListStyleStyleValue(
-        ValueComparingNonnullRefPtr<StyleValue> position,
-        ValueComparingNonnullRefPtr<StyleValue> image,
-        ValueComparingNonnullRefPtr<StyleValue> style_type)
-        : StyleValueWithDefaultOperators(Type::ListStyle)
-        , m_properties { .position = move(position), .image = move(image), .style_type = move(style_type) }
-    {
-    }
-
-    struct Properties {
-        ValueComparingNonnullRefPtr<StyleValue> position;
-        ValueComparingNonnullRefPtr<StyleValue> image;
-        ValueComparingNonnullRefPtr<StyleValue> style_type;
-        bool operator==(Properties const&) const = default;
-    } m_properties;
-};
-
 class NumericStyleValue : public StyleValueWithDefaultOperators<NumericStyleValue> {
 public:
     static ValueComparingNonnullRefPtr<NumericStyleValue> create_float(float value)

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

@@ -0,0 +1,19 @@
+/*
+ * 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 "ListStyleStyleValue.h"
+
+namespace Web::CSS {
+
+ErrorOr<String> ListStyleStyleValue::to_string() const
+{
+    return String::formatted("{} {} {}", TRY(m_properties.position->to_string()), TRY(m_properties.image->to_string()), TRY(m_properties.style_type->to_string()));
+}
+
+}

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

@@ -0,0 +1,53 @@
+/*
+ * 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 <LibWeb/CSS/StyleValue.h>
+
+namespace Web::CSS {
+
+class ListStyleStyleValue final : public StyleValueWithDefaultOperators<ListStyleStyleValue> {
+public:
+    static ValueComparingNonnullRefPtr<ListStyleStyleValue> create(
+        ValueComparingNonnullRefPtr<StyleValue> position,
+        ValueComparingNonnullRefPtr<StyleValue> image,
+        ValueComparingNonnullRefPtr<StyleValue> style_type)
+    {
+        return adopt_ref(*new ListStyleStyleValue(move(position), move(image), move(style_type)));
+    }
+    virtual ~ListStyleStyleValue() override = default;
+
+    ValueComparingNonnullRefPtr<StyleValue> position() const { return m_properties.position; }
+    ValueComparingNonnullRefPtr<StyleValue> image() const { return m_properties.image; }
+    ValueComparingNonnullRefPtr<StyleValue> style_type() const { return m_properties.style_type; }
+
+    virtual ErrorOr<String> to_string() const override;
+
+    bool properties_equal(ListStyleStyleValue const& other) const { return m_properties == other.m_properties; }
+
+private:
+    ListStyleStyleValue(
+        ValueComparingNonnullRefPtr<StyleValue> position,
+        ValueComparingNonnullRefPtr<StyleValue> image,
+        ValueComparingNonnullRefPtr<StyleValue> style_type)
+        : StyleValueWithDefaultOperators(Type::ListStyle)
+        , m_properties { .position = move(position), .image = move(image), .style_type = move(style_type) }
+    {
+    }
+
+    struct Properties {
+        ValueComparingNonnullRefPtr<StyleValue> position;
+        ValueComparingNonnullRefPtr<StyleValue> image;
+        ValueComparingNonnullRefPtr<StyleValue> style_type;
+        bool operator==(Properties const&) const = default;
+    } m_properties;
+};
+
+}