Changeset 294240 in webkit

Timestamp:

May 16, 2022 10:35:40 AM (2 years ago)

Author:

Alan Bujtas

Message:

[LFC][FFC] Add support for logical ordering
​https://bugs.webkit.org/show_bug.cgi?id=240442

Reviewed by Antti Koivisto.

Let's reorder the logicalFlexItemList when the 'order' property has a non-initial value.

• layout/formattingContexts/flex/FlexFormattingContext.cpp:

(WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntegration):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/flex/FlexFormattingContext.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-16  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][FFC] Add support for logical ordering
+        https://bugs.webkit.org/show_bug.cgi?id=240442
+
+        Reviewed by Antti Koivisto.
+
+        Let's reorder the logicalFlexItemList when the 'order' property has a non-initial value.
+
+        * layout/formattingContexts/flex/FlexFormattingContext.cpp:
+        (WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntegration):
+
 2022-05-16  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp

@@ -122 +122 @@
 struct FlexItemLogicalBox {
     FlexRect rect;
-    const ContainerBox& flexItem;
+    int logicalOrder { 0 };
+    CheckedPtr<const ContainerBox> flexItem;
 };
 
@@ -129 +130 @@
     auto& formattingState = this->formattingState();
     Vector<FlexItemLogicalBox> logicalFlexItemList;
-
+    auto flexItemsNeedReordering = false;
 
     auto convertVisualToLogical = [&] {
         // FIXME: Convert visual (row/column) direction to logical.
         auto direction = root().style().flexDirection();
+        auto previousLogicalOrder = std::optional<int> { };
 
         for (auto& flexItem : childrenOfType<ContainerBox>(root())) {
@@ -152 +154 @@
                 break;
             }
-            logicalFlexItemList.append({ { logicalSize }, flexItem });
+            auto flexItemOrder = flexItem.style().order();
+            flexItemsNeedReordering = flexItemsNeedReordering || flexItemOrder != previousLogicalOrder.value_or(0);
+            previousLogicalOrder = flexItemOrder;
+
+            logicalFlexItemList.append({ { logicalSize }, flexItemOrder, &flexItem });
+
         }
     };
     convertVisualToLogical();
+
+    auto reorderFlexItemsIfApplicable = [&] {
+        if (!flexItemsNeedReordering)
+            return;
+
+        std::stable_sort(logicalFlexItemList.begin(), logicalFlexItemList.end(), [&] (auto& a, auto& b) {
+            return a.logicalOrder < b.logicalOrder;
+        });
+    };
+    reorderFlexItemsIfApplicable();
 
     auto logicalLeft = LayoutUnit { };
@@ -170 +187 @@
         auto direction = root().style().flexDirection();
         for (auto& logicalFlexItem : logicalFlexItemList) {
-            auto& flexItemGeometry = formattingState.boxGeometry(logicalFlexItem.flexItem);
+            auto& flexItemGeometry = formattingState.boxGeometry(*logicalFlexItem.flexItem);
             auto topLeft = LayoutPoint { };