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

Userland/Libraries/LibWeb/CMakeLists.txt

@@ -77,6 +77,7 @@ set(SOURCES
     CSS/StyleValues/FlexFlowStyleValue.cpp
     CSS/StyleValues/FlexStyleValue.cpp
     CSS/StyleValues/FontStyleValue.cpp
+    CSS/StyleValues/GridTemplateAreaStyleValue.cpp
     CSS/Supports.cpp
     CSS/SyntaxHighlighter/SyntaxHighlighter.cpp
     CSS/Time.cpp

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

@@ -43,6 +43,7 @@
 #include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FontStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FrequencyStyleValue.h>
+#include <LibWeb/CSS/StyleValues/GridTemplateAreaStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Dump.h>
 #include <LibWeb/Infra/Strings.h>

Userland/Libraries/LibWeb/CSS/StyleProperties.cpp

@@ -11,6 +11,7 @@
 #include <LibWeb/CSS/StyleProperties.h>
 #include <LibWeb/CSS/StyleValues/AngleStyleValue.h>
 #include <LibWeb/CSS/StyleValues/ContentStyleValue.h>
+#include <LibWeb/CSS/StyleValues/GridTemplateAreaStyleValue.h>
 #include <LibWeb/FontCache.h>
 #include <LibWeb/Layout/BlockContainer.h>
 #include <LibWeb/Layout/Node.h>

Userland/Libraries/LibWeb/CSS/StyleValue.cpp

@@ -25,6 +25,7 @@
 #include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FontStyleValue.h>
 #include <LibWeb/CSS/StyleValues/FrequencyStyleValue.h>
+#include <LibWeb/CSS/StyleValues/GridTemplateAreaStyleValue.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/BrowsingContext.h>
 #include <LibWeb/Loader/LoadRequest.h>
@@ -1053,21 +1054,6 @@ ErrorOr<String> GridTrackPlacementStyleValue::to_string() const
     return m_grid_track_placement.to_string();
 }
 
-ErrorOr<String> GridTemplateAreaStyleValue::to_string() const
-{
-    StringBuilder builder;
-    for (size_t y = 0; y < m_grid_template_area.size(); ++y) {
-        for (size_t x = 0; x < m_grid_template_area[y].size(); ++x) {
-            TRY(builder.try_appendff("{}", m_grid_template_area[y][x]));
-            if (x < m_grid_template_area[y].size() - 1)
-                TRY(builder.try_append(" "sv));
-        }
-        if (y < m_grid_template_area.size() - 1)
-            TRY(builder.try_append(", "sv));
-    }
-    return builder.to_string();
-}
-
 ErrorOr<String> GridTrackSizeStyleValue::to_string() const
 {
     return m_grid_track_size_list.to_string();
@@ -1957,11 +1943,6 @@ ErrorOr<String> StyleValueList::to_string() const
     return builder.to_string();
 }
 
-ValueComparingNonnullRefPtr<GridTemplateAreaStyleValue> GridTemplateAreaStyleValue::create(Vector<Vector<String>> grid_template_area)
-{
-    return adopt_ref(*new GridTemplateAreaStyleValue(grid_template_area));
-}
-
 ValueComparingNonnullRefPtr<GridTrackPlacementStyleValue> GridTrackPlacementStyleValue::create(CSS::GridTrackPlacement grid_track_placement)
 {
     return adopt_ref(*new GridTrackPlacementStyleValue(grid_track_placement));

Userland/Libraries/LibWeb/CSS/StyleValue.h

@@ -661,26 +661,6 @@ private:
     NonnullOwnPtr<CalcSum> m_expression;
 };
 
-class GridTemplateAreaStyleValue final : public StyleValueWithDefaultOperators<GridTemplateAreaStyleValue> {
-public:
-    static ValueComparingNonnullRefPtr<GridTemplateAreaStyleValue> create(Vector<Vector<String>> grid_template_area);
-    virtual ~GridTemplateAreaStyleValue() override = default;
-
-    Vector<Vector<String>> const& grid_template_area() const { return m_grid_template_area; }
-    virtual ErrorOr<String> to_string() const override;
-
-    bool properties_equal(GridTemplateAreaStyleValue const& other) const { return m_grid_template_area == other.m_grid_template_area; };
-
-private:
-    explicit GridTemplateAreaStyleValue(Vector<Vector<String>> grid_template_area)
-        : StyleValueWithDefaultOperators(Type::GridTemplateArea)
-        , m_grid_template_area(grid_template_area)
-    {
-    }
-
-    Vector<Vector<String>> m_grid_template_area;
-};
-
 class GridTrackPlacementStyleValue final : public StyleValueWithDefaultOperators<GridTrackPlacementStyleValue> {
 public:
     static ValueComparingNonnullRefPtr<GridTrackPlacementStyleValue> create(CSS::GridTrackPlacement grid_track_placement);

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

@@ -0,0 +1,34 @@
+/*
+ * 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 "GridTemplateAreaStyleValue.h"
+
+namespace Web::CSS {
+
+ValueComparingNonnullRefPtr<GridTemplateAreaStyleValue> GridTemplateAreaStyleValue::create(Vector<Vector<String>> grid_template_area)
+{
+    return adopt_ref(*new GridTemplateAreaStyleValue(grid_template_area));
+}
+
+ErrorOr<String> GridTemplateAreaStyleValue::to_string() const
+{
+    StringBuilder builder;
+    for (size_t y = 0; y < m_grid_template_area.size(); ++y) {
+        for (size_t x = 0; x < m_grid_template_area[y].size(); ++x) {
+            TRY(builder.try_appendff("{}", m_grid_template_area[y][x]));
+            if (x < m_grid_template_area[y].size() - 1)
+                TRY(builder.try_append(" "sv));
+        }
+        if (y < m_grid_template_area.size() - 1)
+            TRY(builder.try_append(", "sv));
+    }
+    return builder.to_string();
+}
+
+}

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

@@ -0,0 +1,36 @@
+/*
+ * 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 GridTemplateAreaStyleValue final : public StyleValueWithDefaultOperators<GridTemplateAreaStyleValue> {
+public:
+    static ValueComparingNonnullRefPtr<GridTemplateAreaStyleValue> create(Vector<Vector<String>> grid_template_area);
+    virtual ~GridTemplateAreaStyleValue() override = default;
+
+    Vector<Vector<String>> const& grid_template_area() const { return m_grid_template_area; }
+    virtual ErrorOr<String> to_string() const override;
+
+    bool properties_equal(GridTemplateAreaStyleValue const& other) const { return m_grid_template_area == other.m_grid_template_area; };
+
+private:
+    explicit GridTemplateAreaStyleValue(Vector<Vector<String>> grid_template_area)
+        : StyleValueWithDefaultOperators(Type::GridTemplateArea)
+        , m_grid_template_area(grid_template_area)
+    {
+    }
+
+    Vector<Vector<String>> m_grid_template_area;
+};
+
+}