Changeset 294237 in webkit

Timestamp:

May 16, 2022 9:33:38 AM (2 years ago)

Author:

Alan Bujtas

Message:

[LFC][FFC] Add "flex-direction: column-reverse" basic visual/logical conversion
​https://bugs.webkit.org/show_bug.cgi?id=240434

Reviewed by Antti Koivisto.

With "flex-direction: column-reverse" the main axis progression is from visual bottom to top (with default writing mode and all that).

• layout/formattingContexts/flex/FlexFormattingContext.cpp:

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-16  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][FFC] Add "flex-direction: column-reverse" basic visual/logical conversion
+        https://bugs.webkit.org/show_bug.cgi?id=240434
+
+        Reviewed by Antti Koivisto.
+
+        With "flex-direction: column-reverse" the main axis progression is from visual bottom to top (with default writing mode and all that).
+
+        * layout/formattingContexts/flex/FlexFormattingContext.cpp:
+        (WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntegration):
+
 2022-05-16  Patrick Angle  <pangle@apple.com>
 

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

@@ -145 +145 @@
                 break;
             case FlexDirection::Column:
+            case FlexDirection::ColumnReverse:
                 logicalSize = { flexItemGeometry.marginBoxHeight(), flexItemGeometry.marginBoxWidth() };
-                break;
-            case FlexDirection::ColumnReverse:
-                ASSERT_NOT_IMPLEMENTED_YET();
                 break;
             default:
@@ -169 +167 @@
     auto convertLogicalToVisual = [&] {
         // FIXME: Convert logical coordinates to visual.
+        auto logicalWidth = logicalFlexItemList.last().rect.right() - logicalFlexItemList.first().rect.left();
         auto direction = root().style().flexDirection();
         for (auto& logicalFlexItem : logicalFlexItemList) {
@@ -187 +186 @@
             }
             case FlexDirection::ColumnReverse:
-                ASSERT_NOT_IMPLEMENTED_YET();
+                topLeft = { constraints.horizontal().logicalLeft + logicalFlexItem.rect.top(), constraints.logicalTop() + logicalWidth - logicalFlexItem.rect.right() };
                 break;
             default: