LibWeb: Use variant to represent CSS::ExplicitGridTrack

No behavior change.

Libraries/LibWeb/CSS/GridTrackSize.cpp

@@ -179,44 +179,16 @@ String GridRepeat::to_string() const
     return MUST(builder.to_string());
 }
 
-ExplicitGridTrack::ExplicitGridTrack(CSS::GridFitContent grid_fit_content)
+ExplicitGridTrack::ExplicitGridTrack(Variant<GridFitContent, GridRepeat, GridMinMax, GridSize>&& value)
-    : m_type(Type::FitContent)
+    : m_value(move(value))
-    , m_grid_fit_content(grid_fit_content)
-{
-}
-
-ExplicitGridTrack::ExplicitGridTrack(CSS::GridMinMax grid_minmax)
-    : m_type(Type::MinMax)
-    , m_grid_minmax(grid_minmax)
-{
-}
-
-ExplicitGridTrack::ExplicitGridTrack(CSS::GridRepeat grid_repeat)
-    : m_type(Type::Repeat)
-    , m_grid_repeat(grid_repeat)
-{
-}
-
-ExplicitGridTrack::ExplicitGridTrack(CSS::GridSize grid_size)
-    : m_type(Type::Default)
-    , m_grid_size(grid_size)
 {
 }
 
 String ExplicitGridTrack::to_string() const
 {
-    switch (m_type) {
+    return m_value.visit([](auto const& track) {
-    case Type::FitContent:
+        return track.to_string();
-        return m_grid_fit_content.to_string();
+    });
-    case Type::MinMax:
-        return m_grid_minmax.to_string();
-    case Type::Repeat:
-        return m_grid_repeat.to_string();
-    case Type::Default:
-        return m_grid_size.to_string();
-    default:
-        VERIFY_NOT_REACHED();
-    }
 }
 
 String GridLineNames::to_string() const

Libraries/LibWeb/CSS/GridTrackSize.h

@@ -167,67 +167,25 @@ private:
 
 class ExplicitGridTrack {
 public:
-    enum class Type {
+    ExplicitGridTrack(Variant<GridFitContent, GridRepeat, GridMinMax, GridSize>&& value);
-        FitContent,
-        MinMax,
-        Repeat,
-        Default,
-    };
-    ExplicitGridTrack(CSS::GridFitContent);
-    ExplicitGridTrack(CSS::GridRepeat);
-    ExplicitGridTrack(CSS::GridMinMax);
-    ExplicitGridTrack(CSS::GridSize);
 
-    bool is_fit_content() const { return m_type == Type::FitContent; }
+    bool is_fit_content() const { return m_value.has<GridFitContent>(); }
-    GridFitContent fit_content() const
+    GridFitContent const& fit_content() const { return m_value.get<GridFitContent>(); }
-    {
-        VERIFY(is_fit_content());
-        return m_grid_fit_content;
-    }
 
-    bool is_repeat() const { return m_type == Type::Repeat; }
+    bool is_repeat() const { return m_value.has<GridRepeat>(); }
-    GridRepeat repeat() const
+    GridRepeat const& repeat() const { return m_value.get<GridRepeat>(); }
-    {
-        VERIFY(is_repeat());
-        return m_grid_repeat;
-    }
 
-    bool is_minmax() const { return m_type == Type::MinMax; }
+    bool is_minmax() const { return m_value.has<GridMinMax>(); }
-    GridMinMax minmax() const
+    GridMinMax const& minmax() const { return m_value.get<GridMinMax>(); }
-    {
-        VERIFY(is_minmax());
-        return m_grid_minmax;
-    }
 
-    bool is_default() const { return m_type == Type::Default; }
+    bool is_default() const { return m_value.has<GridSize>(); }
-    GridSize grid_size() const
+    GridSize const& grid_size() const { return m_value.get<GridSize>(); }
-    {
-        VERIFY(is_default());
-        return m_grid_size;
-    }
-
-    Type type() const { return m_type; }
 
     String to_string() const;
-    bool operator==(ExplicitGridTrack const& other) const
+    bool operator==(ExplicitGridTrack const& other) const = default;
-    {
-        if (is_fit_content() && other.is_fit_content())
-            return m_grid_fit_content == other.fit_content();
-        if (is_repeat() && other.is_repeat())
-            return m_grid_repeat == other.repeat();
-        if (is_minmax() && other.is_minmax())
-            return m_grid_minmax == other.minmax();
-        if (is_default() && other.is_default())
-            return m_grid_size == other.grid_size();
-        return false;
-    }
 
 private:
-    Type m_type;
+    Variant<GridFitContent, GridRepeat, GridMinMax, GridSize> m_value;
-    GridFitContent m_grid_fit_content;
-    GridRepeat m_grid_repeat;
-    GridMinMax m_grid_minmax;
-    GridSize m_grid_size;
 };
 
 }

Libraries/LibWeb/Layout/GridFormattingContext.cpp

@@ -577,18 +577,13 @@ void GridFormattingContext::initialize_grid_tracks_from_definition(GridDimension
                 repeat_count = track_definition.repeat().repeat_count();
         }
         for (auto _ = 0; _ < repeat_count; _++) {
-            switch (track_definition.type()) {
+            if (track_definition.is_default() || track_definition.is_fit_content() || track_definition.is_minmax()) {
-            case CSS::ExplicitGridTrack::Type::Default:
-            case CSS::ExplicitGridTrack::Type::FitContent:
-            case CSS::ExplicitGridTrack::Type::MinMax:
                 tracks.append(GridTrack::create_from_definition(track_definition));
-                break;
+            } else if (track_definition.is_repeat()) {
-            case CSS::ExplicitGridTrack::Type::Repeat:
                 for (auto& explicit_grid_track : track_definition.repeat().grid_track_size_list().track_list()) {
                     tracks.append(GridTrack::create_from_definition(explicit_grid_track));
                 }
-                break;
+            } else {
-            default:
                 VERIFY_NOT_REACHED();
             }
         }