From 95d17ee875f479f9c741bd478c693551bd02766d Mon Sep 17 00:00:00 2001
From: Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
Date: Tue, 16 May 2023 14:19:28 +0300
Subject: [PATCH] LibWeb: Rename flexible_length to flex_factor in GridSize

Let's match the name used in the spec.
---
 Userland/Libraries/LibWeb/CSS/GridTrackSize.cpp        |  6 +++---
 Userland/Libraries/LibWeb/CSS/GridTrackSize.h          |  6 +++---
 .../Libraries/LibWeb/Layout/GridFormattingContext.cpp  | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Userland/Libraries/LibWeb/CSS/GridTrackSize.cpp b/Userland/Libraries/LibWeb/CSS/GridTrackSize.cpp
index 22fcdb13fb..e8ed964d4c 100644
--- a/Userland/Libraries/LibWeb/CSS/GridTrackSize.cpp
+++ b/Userland/Libraries/LibWeb/CSS/GridTrackSize.cpp
@@ -14,10 +14,10 @@ GridSize::GridSize(LengthPercentage length_percentage)
     : m_type(Type::LengthPercentage)
     , m_length_percentage(length_percentage) {};
 
-GridSize::GridSize(float flexible_length)
+GridSize::GridSize(float flex_factor)
     : m_type(Type::FlexibleLength)
     , m_length_percentage { Length::make_px(0) }
-    , m_flexible_length(flexible_length)
+    , m_flex_factor(flex_factor)
 {
 }
 
@@ -60,7 +60,7 @@ ErrorOr<String> GridSize::to_string() const
     case Type::LengthPercentage:
         return m_length_percentage.to_string();
     case Type::FlexibleLength:
-        return String::formatted("{}fr", m_flexible_length);
+        return String::formatted("{}fr", m_flex_factor);
     case Type::MaxContent:
         return "max-content"_string;
     case Type::MinContent:
diff --git a/Userland/Libraries/LibWeb/CSS/GridTrackSize.h b/Userland/Libraries/LibWeb/CSS/GridTrackSize.h
index 5edd250c1c..7aed327bfa 100644
--- a/Userland/Libraries/LibWeb/CSS/GridTrackSize.h
+++ b/Userland/Libraries/LibWeb/CSS/GridTrackSize.h
@@ -37,7 +37,7 @@ public:
     bool is_min_content() const { return m_type == Type::MinContent; }
 
     LengthPercentage length_percentage() const { return m_length_percentage; };
-    float flexible_length() const { return m_flexible_length; }
+    float flex_factor() const { return m_flex_factor; }
 
     // https://www.w3.org/TR/css-grid-2/#layout-algorithm
     // An intrinsic sizing function (min-content, max-content, auto, fit-content()).
@@ -59,13 +59,13 @@ public:
     {
         return m_type == other.type()
             && m_length_percentage == other.length_percentage()
-            && m_flexible_length == other.flexible_length();
+            && m_flex_factor == other.flex_factor();
     }
 
 private:
     Type m_type;
     LengthPercentage m_length_percentage;
-    float m_flexible_length { 0 };
+    float m_flex_factor { 0 };
 };
 
 class GridMinMax {
diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
index abcdb0f8de..4b252a3a38 100644
--- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
+++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
@@ -1074,7 +1074,7 @@ void GridFormattingContext::expand_flexible_tracks(AvailableSpace const& availab
         auto flex_factor_sum = 0;
         for (auto& track : tracks) {
             if (track.max_track_sizing_function.is_flexible_length())
-                flex_factor_sum += track.max_track_sizing_function.flexible_length();
+                flex_factor_sum += track.max_track_sizing_function.flex_factor();
         }
         if (flex_factor_sum < 1)
             flex_factor_sum = 1;
@@ -1109,8 +1109,8 @@ void GridFormattingContext::expand_flexible_tracks(AvailableSpace const& availab
             // the track’s base size by its flex factor; otherwise, the track’s base size.
             for (auto& track : tracks) {
                 if (track.max_track_sizing_function.is_flexible_length()) {
-                    if (track.max_track_sizing_function.flexible_length() > 1) {
-                        result = max(result, track.base_size / track.max_track_sizing_function.flexible_length());
+                    if (track.max_track_sizing_function.flex_factor() > 1) {
+                        result = max(result, track.base_size / track.max_track_sizing_function.flex_factor());
                     } else {
                         result = max(result, track.base_size);
                     }
@@ -1143,8 +1143,8 @@ void GridFormattingContext::expand_flexible_tracks(AvailableSpace const& availab
     // For each flexible track, if the product of the used flex fraction and the track’s flex factor is greater than
     // the track’s base size, set its base size to that product.
     for (auto& track : tracks_and_gaps) {
-        if (track.max_track_sizing_function.flexible_length() * flex_fraction > track.base_size) {
-            track.base_size = track.max_track_sizing_function.flexible_length() * flex_fraction;
+        if (track.max_track_sizing_function.flex_factor() * flex_fraction > track.base_size) {
+            track.base_size = track.max_track_sizing_function.flex_factor() * flex_fraction;
         }
     }
 }