From 9359df4be97812bf77acc6308de902d32a7c484b Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Wed, 13 Oct 2021 22:25:39 +0200
Subject: [PATCH] LibWeb: Move FFC layout algorithm step 16 to a separate
 function

---
 .../LibWeb/Layout/FlexFormattingContext.cpp   | 26 ++++++++++++-------
 .../LibWeb/Layout/FlexFormattingContext.h     |  2 ++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
index 1b26cab7ce..480826ae13 100644
--- a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
+++ b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
@@ -132,16 +132,8 @@ void FlexFormattingContext::run(Box& flex_container, LayoutMode)
     // 15. Determine the flex container’s used cross size:
     determine_flex_container_used_cross_size(flex_container, flex_lines, cross_min_size, cross_max_size);
 
-    // 16. Align all flex lines
-    // FIXME: Support align-content
-    // FIXME: Support reverse
-    for (auto& flex_line : flex_lines) {
-        for (auto* flex_item : flex_line.items) {
-            set_main_size(flex_item->box, flex_item->main_size);
-            set_cross_size(flex_item->box, flex_item->cross_size);
-            set_offset(flex_item->box, flex_item->main_offset, flex_item->cross_offset);
-        }
-    }
+    // 16. Align all flex lines (per align-content)
+    align_all_flex_lines(flex_lines);
 }
 
 static void populate_specified_margins(FlexItem& item, CSS::FlexDirection flex_direction)
@@ -961,4 +953,18 @@ void FlexFormattingContext::determine_flex_container_used_cross_size(Box& flex_c
     }
 }
 
+// https://www.w3.org/TR/css-flexbox-1/#algo-line-align
+void FlexFormattingContext::align_all_flex_lines(Vector<FlexLine>& flex_lines)
+{
+    // FIXME: Support align-content
+    // FIXME: Support reverse
+    for (auto& flex_line : flex_lines) {
+        for (auto* flex_item : flex_line.items) {
+            set_main_size(flex_item->box, flex_item->main_size);
+            set_cross_size(flex_item->box, flex_item->cross_size);
+            set_offset(flex_item->box, flex_item->main_offset, flex_item->cross_offset);
+        }
+    }
+}
+
 }
diff --git a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h
index 295218d8b0..6c46b6fb12 100644
--- a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h
+++ b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h
@@ -78,6 +78,8 @@ private:
 
     void determine_flex_container_used_cross_size(Box& flex_container, Vector<FlexLine> const&, float cross_min_size, float cross_max_size);
 
+    void align_all_flex_lines(Vector<FlexLine>&);
+
     bool is_row_layout() const { return m_flex_direction == CSS::FlexDirection::Row || m_flex_direction == CSS::FlexDirection::RowReverse; }
 
     CSS::FlexDirection m_flex_direction {};