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

Userland/Libraries/LibWeb/CMakeLists.txt

@@ -74,6 +74,7 @@ set(SOURCES
     CSS/StyleValues/ColorStyleValue.cpp
     CSS/StyleValues/ContentStyleValue.cpp
     CSS/StyleValues/FilterValueListStyleValue.cpp
+    CSS/StyleValues/FlexStyleValue.cpp
     CSS/Supports.cpp
     CSS/SyntaxHighlighter/SyntaxHighlighter.cpp
     CSS/Time.cpp

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

@@ -39,6 +39,7 @@
 #include <LibWeb/CSS/StyleValues/ColorStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ContentStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FilterValueListStyleValue.h>
+#include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Dump.h>
 #include <LibWeb/Infra/Strings.h>

Userland/Libraries/LibWeb/CSS/StyleComputer.cpp

@@ -31,6 +31,7 @@
 #include <LibWeb/CSS/StyleValues/BorderStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ColorStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FilterValueListStyleValue.h>
+#include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/FontCache.h>

Userland/Libraries/LibWeb/CSS/StyleValue.cpp

@@ -21,6 +21,7 @@
 #include <LibWeb/CSS/StyleValues/ColorStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ContentStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FilterValueListStyleValue.h>
+#include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/Loader/LoadRequest.h>
@@ -1023,11 +1024,6 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberSumPartW
     return value->resolve(layout_node, percentage_basis);
 }
 
-ErrorOr<String> FlexStyleValue::to_string() const
-{
-    return String::formatted("{} {} {}", TRY(m_properties.grow->to_string()), TRY(m_properties.shrink->to_string()), TRY(m_properties.basis->to_string()));
-}
-
 ErrorOr<String> FlexFlowStyleValue::to_string() const
 {
     return String::formatted("{} {}", TRY(m_properties.flex_direction->to_string()), TRY(m_properties.flex_wrap->to_string()));

Userland/Libraries/LibWeb/CSS/StyleValue.h

@@ -661,43 +661,6 @@ private:
     NonnullOwnPtr<CalcSum> m_expression;
 };
 
-class FlexStyleValue final : public StyleValueWithDefaultOperators<FlexStyleValue> {
-public:
-    static ValueComparingNonnullRefPtr<FlexStyleValue> create(
-        ValueComparingNonnullRefPtr<StyleValue> grow,
-        ValueComparingNonnullRefPtr<StyleValue> shrink,
-        ValueComparingNonnullRefPtr<StyleValue> basis)
-    {
-        return adopt_ref(*new FlexStyleValue(move(grow), move(shrink), move(basis)));
-    }
-    virtual ~FlexStyleValue() override = default;
-
-    ValueComparingNonnullRefPtr<StyleValue> grow() const { return m_properties.grow; }
-    ValueComparingNonnullRefPtr<StyleValue> shrink() const { return m_properties.shrink; }
-    ValueComparingNonnullRefPtr<StyleValue> basis() const { return m_properties.basis; }
-
-    virtual ErrorOr<String> to_string() const override;
-
-    bool properties_equal(FlexStyleValue const& other) const { return m_properties == other.m_properties; };
-
-private:
-    FlexStyleValue(
-        ValueComparingNonnullRefPtr<StyleValue> grow,
-        ValueComparingNonnullRefPtr<StyleValue> shrink,
-        ValueComparingNonnullRefPtr<StyleValue> basis)
-        : StyleValueWithDefaultOperators(Type::Flex)
-        , m_properties { .grow = move(grow), .shrink = move(shrink), .basis = move(basis) }
-    {
-    }
-
-    struct Properties {
-        ValueComparingNonnullRefPtr<StyleValue> grow;
-        ValueComparingNonnullRefPtr<StyleValue> shrink;
-        ValueComparingNonnullRefPtr<StyleValue> basis;
-        bool operator==(Properties const&) const = default;
-    } m_properties;
-};
-
 class FlexFlowStyleValue final : public StyleValueWithDefaultOperators<FlexFlowStyleValue> {
 public:
     static ValueComparingNonnullRefPtr<FlexFlowStyleValue> create(ValueComparingNonnullRefPtr<StyleValue> flex_direction, ValueComparingNonnullRefPtr<StyleValue> flex_wrap)

Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.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 "FlexStyleValue.h"
+
+namespace Web::CSS {
+
+ErrorOr<String> FlexStyleValue::to_string() const
+{
+    return String::formatted("{} {} {}", TRY(m_properties.grow->to_string()), TRY(m_properties.shrink->to_string()), TRY(m_properties.basis->to_string()));
+}
+
+}

Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.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 FlexStyleValue final : public StyleValueWithDefaultOperators<FlexStyleValue> {
+public:
+    static ValueComparingNonnullRefPtr<FlexStyleValue> create(
+        ValueComparingNonnullRefPtr<StyleValue> grow,
+        ValueComparingNonnullRefPtr<StyleValue> shrink,
+        ValueComparingNonnullRefPtr<StyleValue> basis)
+    {
+        return adopt_ref(*new FlexStyleValue(move(grow), move(shrink), move(basis)));
+    }
+    virtual ~FlexStyleValue() override = default;
+
+    ValueComparingNonnullRefPtr<StyleValue> grow() const { return m_properties.grow; }
+    ValueComparingNonnullRefPtr<StyleValue> shrink() const { return m_properties.shrink; }
+    ValueComparingNonnullRefPtr<StyleValue> basis() const { return m_properties.basis; }
+
+    virtual ErrorOr<String> to_string() const override;
+
+    bool properties_equal(FlexStyleValue const& other) const { return m_properties == other.m_properties; };
+
+private:
+    FlexStyleValue(
+        ValueComparingNonnullRefPtr<StyleValue> grow,
+        ValueComparingNonnullRefPtr<StyleValue> shrink,
+        ValueComparingNonnullRefPtr<StyleValue> basis)
+        : StyleValueWithDefaultOperators(Type::Flex)
+        , m_properties { .grow = move(grow), .shrink = move(shrink), .basis = move(basis) }
+    {
+    }
+
+    struct Properties {
+        ValueComparingNonnullRefPtr<StyleValue> grow;
+        ValueComparingNonnullRefPtr<StyleValue> shrink;
+        ValueComparingNonnullRefPtr<StyleValue> basis;
+        bool operator==(Properties const&) const = default;
+    } m_properties;
+};
+
+}