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

Userland/Libraries/LibWeb/CMakeLists.txt

@@ -65,6 +65,7 @@ set(SOURCES
     CSS/StyleSheetList.cpp
     CSS/StyleValue.cpp
     CSS/StyleValues/AngleStyleValue.cpp
+    CSS/StyleValues/BackgroundRepeatStyleValue.cpp
     CSS/StyleValues/BackgroundStyleValue.cpp
     CSS/Supports.cpp
     CSS/SyntaxHighlighter/SyntaxHighlighter.cpp

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

@@ -30,6 +30,7 @@
 #include <LibWeb/CSS/Selector.h>
 #include <LibWeb/CSS/StyleValue.h>
 #include <LibWeb/CSS/StyleValues/AngleStyleValue.h>
+#include <LibWeb/CSS/StyleValues/BackgroundRepeatStyleValue.h>
 #include <LibWeb/CSS/StyleValues/BackgroundStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Dump.h>

Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2021-2023, Andreas Kling <kling@serenityos.org>
  * Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
- * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
+ * Copyright (c) 2022-2023, Sam Atkins <atkinssj@serenityos.org>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -12,6 +12,7 @@
 #include <LibWeb/CSS/Enums.h>
 #include <LibWeb/CSS/ResolvedCSSStyleDeclaration.h>
 #include <LibWeb/CSS/StyleComputer.h>
+#include <LibWeb/CSS/StyleValues/BackgroundRepeatStyleValue.h>
 #include <LibWeb/CSS/StyleValues/BackgroundStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Element.h>

Userland/Libraries/LibWeb/CSS/StyleValue.cpp

@@ -12,6 +12,7 @@
 #include <LibWeb/CSS/Serialize.h>
 #include <LibWeb/CSS/StyleValue.h>
 #include <LibWeb/CSS/StyleValues/AngleStyleValue.h>
+#include <LibWeb/CSS/StyleValues/BackgroundRepeatStyleValue.h>
 #include <LibWeb/CSS/StyleValues/BackgroundStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/BrowsingContext.h>
@@ -292,11 +293,6 @@ StyleValueList const& StyleValue::as_value_list() const
     return static_cast<StyleValueList const&>(*this);
 }
 
-ErrorOr<String> BackgroundRepeatStyleValue::to_string() const
-{
-    return String::formatted("{} {}", CSS::to_string(m_properties.repeat_x), CSS::to_string(m_properties.repeat_y));
-}
-
 ErrorOr<String> BackgroundSizeStyleValue::to_string() const
 {
     return String::formatted("{} {}", TRY(m_properties.size_x.to_string()), TRY(m_properties.size_y.to_string()));

Userland/Libraries/LibWeb/CSS/StyleValue.h

@@ -502,35 +502,6 @@ struct StyleValueWithDefaultOperators : public StyleValue {
     }
 };
 
-class BackgroundRepeatStyleValue final : public StyleValueWithDefaultOperators<BackgroundRepeatStyleValue> {
-public:
-    static ValueComparingNonnullRefPtr<BackgroundRepeatStyleValue> create(Repeat repeat_x, Repeat repeat_y)
-    {
-        return adopt_ref(*new BackgroundRepeatStyleValue(repeat_x, repeat_y));
-    }
-    virtual ~BackgroundRepeatStyleValue() override = default;
-
-    Repeat repeat_x() const { return m_properties.repeat_x; }
-    Repeat repeat_y() const { return m_properties.repeat_y; }
-
-    virtual ErrorOr<String> to_string() const override;
-
-    bool properties_equal(BackgroundRepeatStyleValue const& other) const { return m_properties == other.m_properties; }
-
-private:
-    BackgroundRepeatStyleValue(Repeat repeat_x, Repeat repeat_y)
-        : StyleValueWithDefaultOperators(Type::BackgroundRepeat)
-        , m_properties { .repeat_x = repeat_x, .repeat_y = repeat_y }
-    {
-    }
-
-    struct Properties {
-        Repeat repeat_x;
-        Repeat repeat_y;
-        bool operator==(Properties const&) const = default;
-    } m_properties;
-};
-
 // NOTE: This is not used for identifier sizes, like `cover` and `contain`.
 class BackgroundSizeStyleValue final : public StyleValueWithDefaultOperators<BackgroundSizeStyleValue> {
 public:

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

@@ -0,0 +1,28 @@
+/*
+ * 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 "BackgroundRepeatStyleValue.h"
+#include <AK/String.h>
+
+namespace Web::CSS {
+
+BackgroundRepeatStyleValue::BackgroundRepeatStyleValue(Repeat repeat_x, Repeat repeat_y)
+    : StyleValueWithDefaultOperators(Type::BackgroundRepeat)
+    , m_properties { .repeat_x = repeat_x, .repeat_y = repeat_y }
+{
+}
+
+BackgroundRepeatStyleValue::~BackgroundRepeatStyleValue() = default;
+
+ErrorOr<String> BackgroundRepeatStyleValue::to_string() const
+{
+    return String::formatted("{} {}", CSS::to_string(m_properties.repeat_x), CSS::to_string(m_properties.repeat_y));
+}
+
+}

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

@@ -0,0 +1,42 @@
+/*
+ * 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/Enums.h>
+#include <LibWeb/CSS/StyleValue.h>
+
+namespace Web::CSS {
+
+class BackgroundRepeatStyleValue final : public StyleValueWithDefaultOperators<BackgroundRepeatStyleValue> {
+public:
+    static ValueComparingNonnullRefPtr<BackgroundRepeatStyleValue> create(Repeat repeat_x, Repeat repeat_y)
+    {
+        return adopt_ref(*new BackgroundRepeatStyleValue(repeat_x, repeat_y));
+    }
+    virtual ~BackgroundRepeatStyleValue() override;
+
+    Repeat repeat_x() const { return m_properties.repeat_x; }
+    Repeat repeat_y() const { return m_properties.repeat_y; }
+
+    virtual ErrorOr<String> to_string() const override;
+
+    bool properties_equal(BackgroundRepeatStyleValue const& other) const { return m_properties == other.m_properties; }
+
+private:
+    BackgroundRepeatStyleValue(Repeat repeat_x, Repeat repeat_y);
+
+    struct Properties {
+        Repeat repeat_x;
+        Repeat repeat_y;
+        bool operator==(Properties const&) const = default;
+    } m_properties;
+};
+
+}

Userland/Libraries/LibWeb/Layout/Node.cpp

@@ -5,6 +5,7 @@
  */
 
 #include <AK/Demangle.h>
+#include <LibWeb/CSS/StyleValues/BackgroundRepeatStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Dump.h>
 #include <LibWeb/HTML/BrowsingContext.h>