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

Userland/Libraries/LibWeb/CMakeLists.txt

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

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

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

Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp

@@ -25,6 +25,7 @@
 #include <LibWeb/CSS/StyleValues/IdentifierStyleValue.h>
 #include <LibWeb/CSS/StyleValues/InitialStyleValue.h>
 #include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
+#include <LibWeb/CSS/StyleValues/NumericStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/Layout/Viewport.h>

Userland/Libraries/LibWeb/CSS/StyleComputer.cpp

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

Userland/Libraries/LibWeb/CSS/StyleValue.cpp

@@ -39,6 +39,7 @@
 #include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
 #include <LibWeb/CSS/StyleValues/LinearGradientStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ListStyleStyleValue.h>
+#include <LibWeb/CSS/StyleValues/NumericStyleValue.h>
 #include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/BrowsingContext.h>
@@ -1136,14 +1137,6 @@ ErrorOr<void> PositionValue::serialize(StringBuilder& builder) const
     return {};
 }
 
-ErrorOr<String> NumericStyleValue::to_string() const
-{
-    return m_value.visit(
-        [](auto value) {
-            return String::formatted("{}", value);
-        });
-}
-
 ErrorOr<String> OverflowStyleValue::to_string() const
 {
     return String::formatted("{} {}", TRY(m_properties.overflow_x->to_string()), TRY(m_properties.overflow_y->to_string()));

Userland/Libraries/LibWeb/CSS/StyleValue.h

@@ -627,46 +627,6 @@ private:
     NonnullOwnPtr<CalcSum> m_expression;
 };
 
-class NumericStyleValue : public StyleValueWithDefaultOperators<NumericStyleValue> {
-public:
-    static ValueComparingNonnullRefPtr<NumericStyleValue> create_float(float value)
-    {
-        return adopt_ref(*new NumericStyleValue(value));
-    }
-
-    static ValueComparingNonnullRefPtr<NumericStyleValue> create_integer(i64 value)
-    {
-        return adopt_ref(*new NumericStyleValue(value));
-    }
-
-    virtual bool has_length() const override { return to_number() == 0; }
-    virtual Length to_length() const override { return Length::make_px(0); }
-
-    virtual bool has_number() const override { return true; }
-    virtual float to_number() const override
-    {
-        return m_value.visit(
-            [](float value) { return value; },
-            [](i64 value) { return (float)value; });
-    }
-
-    virtual bool has_integer() const override { return m_value.has<i64>(); }
-    virtual float to_integer() const override { return m_value.get<i64>(); }
-
-    virtual ErrorOr<String> to_string() const override;
-
-    bool properties_equal(NumericStyleValue const& other) const { return m_value == other.m_value; }
-
-private:
-    explicit NumericStyleValue(Variant<float, i64> value)
-        : StyleValueWithDefaultOperators(Type::Numeric)
-        , m_value(move(value))
-    {
-    }
-
-    Variant<float, i64> m_value { (i64)0 };
-};
-
 class OverflowStyleValue final : public StyleValueWithDefaultOperators<OverflowStyleValue> {
 public:
     static ValueComparingNonnullRefPtr<OverflowStyleValue> create(ValueComparingNonnullRefPtr<StyleValue> overflow_x, ValueComparingNonnullRefPtr<StyleValue> overflow_y)

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

@@ -0,0 +1,22 @@
+/*
+ * 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 "NumericStyleValue.h"
+
+namespace Web::CSS {
+
+ErrorOr<String> NumericStyleValue::to_string() const
+{
+    return m_value.visit(
+        [](auto value) {
+            return String::formatted("{}", value);
+        });
+}
+
+}

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

@@ -0,0 +1,56 @@
+/*
+ * 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 NumericStyleValue : public StyleValueWithDefaultOperators<NumericStyleValue> {
+public:
+    static ValueComparingNonnullRefPtr<NumericStyleValue> create_float(float value)
+    {
+        return adopt_ref(*new NumericStyleValue(value));
+    }
+
+    static ValueComparingNonnullRefPtr<NumericStyleValue> create_integer(i64 value)
+    {
+        return adopt_ref(*new NumericStyleValue(value));
+    }
+
+    virtual bool has_length() const override { return to_number() == 0; }
+    virtual Length to_length() const override { return Length::make_px(0); }
+
+    virtual bool has_number() const override { return true; }
+    virtual float to_number() const override
+    {
+        return m_value.visit(
+            [](float value) { return value; },
+            [](i64 value) { return (float)value; });
+    }
+
+    virtual bool has_integer() const override { return m_value.has<i64>(); }
+    virtual float to_integer() const override { return m_value.get<i64>(); }
+
+    virtual ErrorOr<String> to_string() const override;
+
+    bool properties_equal(NumericStyleValue const& other) const { return m_value == other.m_value; }
+
+private:
+    explicit NumericStyleValue(Variant<float, i64> value)
+        : StyleValueWithDefaultOperators(Type::Numeric)
+        , m_value(move(value))
+    {
+    }
+
+    Variant<float, i64> m_value { (i64)0 };
+};
+
+}