Changeset 294198 in webkit

Timestamp:

May 14, 2022 9:56:07 AM (2 years ago)

Author:

Alan Bujtas

Message:

[FFC][Integration] Add "fixed sized/all default value" flex layout
​https://bugs.webkit.org/show_bug.cgi?id=240414

Reviewed by Antti Koivisto.

This patch adds support for the simplest possible flex layout (fixed size, no-wrap, no-reversed etc).

• layout/formattingContexts/flex/FlexFormattingContext.cpp:

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-14  Alan Bujtas  <zalan@apple.com>
+
+        [FFC][Integration] Add "fixed sized/all default value" flex layout
+        https://bugs.webkit.org/show_bug.cgi?id=240414
+
+        Reviewed by Antti Koivisto.
+
+        This patch adds support for the simplest possible flex layout (fixed size, no-wrap, no-reversed etc).
+
+        * layout/formattingContexts/flex/FlexFormattingContext.cpp:
+        (WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntegration):
+
 2022-05-14  Kimmo Kinnunen  <kkinnunen@apple.com>
 

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

@@ -119 +119 @@
 }
 
-void FlexFormattingContext::layoutInFlowContentForIntegration(const ConstraintsForInFlowContent&)
+void FlexFormattingContext::layoutInFlowContentForIntegration(const ConstraintsForInFlowContent& constraints)
 {
+    auto& formattingState = this->formattingState();
+    auto mainAxisPosition = constraints.horizontal().logicalLeft;
+    auto crossAxisPosition = constraints.logicalTop();
+    for (auto& flexItem : childrenOfType<ContainerBox>(root())) {
+        auto& flexItemGeometry = formattingState.boxGeometry(flexItem);
+
+        flexItemGeometry.setLogicalTopLeft({ mainAxisPosition, crossAxisPosition });
+        mainAxisPosition = BoxGeometry::borderBoxRect(flexItemGeometry).right();
+    }
 }