Changeset 295001 in webkit

Timestamp:

May 28, 2022, 9:31:20 AM (3 years ago)

Author:

Alan Bujtas

Message:

Introduce FlexFormattingContext::computeLogicalHeightForFlexItems
​https://bugs.webkit.org/show_bug.cgi?id=241056

Reviewed by Antti Koivisto.

This is just a very basic "let's stretch the flex items in the cross axis direction" change.

• Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp:

(WebCore::Layout::availableLogicalVerticalSpace):
(WebCore::Layout::availableLogicalHorizontalSpace):
(WebCore::Layout::FlexFormattingContext::setFlexItemsGeometry):
(WebCore::Layout::FlexFormattingContext::computeLogicalWidthForFlexItems):
(WebCore::Layout::FlexFormattingContext::computeLogicalHeightForFlexItems):
(WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntegration):

• Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.h:

Canonical link: ​https://commits.webkit.org/251099@main

Location:

trunk/Source/WebCore/layout/formattingContexts/flex

Files:

• FlexFormattingContext.cpp (modified) (5 diffs)
• FlexFormattingContext.h (modified) (1 diff)

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

@@ -120 +120 @@
 }
 
+static inline std::optional<LayoutUnit> availableLogicalVerticalSpace(const ContainerBox& root, const ConstraintsForFlexContent& flexConstraints)
+{
+    auto flexDirection = root.style().flexDirection();
+    auto flexDirectionIsInlineAxis = flexDirection == FlexDirection::Row || flexDirection == FlexDirection::RowReverse;
+    return { flexDirectionIsInlineAxis ? flexConstraints.availableVerticalSpace() : std::make_optional(flexConstraints.horizontal().logicalWidth) };
+}
+
+static inline std::optional<LayoutUnit> availableLogicalHorizontalSpace(const ContainerBox& root, const ConstraintsForFlexContent& flexConstraints)
+{
+    auto flexDirection = root.style().flexDirection();
+    auto flexDirectionIsInlineAxis = flexDirection == FlexDirection::Row || flexDirection == FlexDirection::RowReverse;
+    return { flexDirectionIsInlineAxis ? std::make_optional(flexConstraints.horizontal().logicalWidth) : flexConstraints.availableVerticalSpace() };
+}
+
 FlexFormattingContext::LogicalFlexItems FlexFormattingContext::convertFlexItemsToLogicalSpace()
 {
@@ -198 +212 @@
         }
         flexItemGeometry.setLogicalTopLeft(topLeft);
-        if (direction == FlexDirection::Row || direction == FlexDirection::RowReverse)
+        if (direction == FlexDirection::Row || direction == FlexDirection::RowReverse) {
             flexItemGeometry.setContentBoxWidth(logicalFlexItem.rect.width() - flexItemGeometry.horizontalMarginBorderAndPadding());
-        else
+            flexItemGeometry.setContentBoxHeight(logicalFlexItem.rect.height() - flexItemGeometry.verticalMarginBorderAndPadding());
+        } else {
+            flexItemGeometry.setContentBoxWidth(logicalFlexItem.rect.height() - flexItemGeometry.horizontalMarginBorderAndPadding());
             flexItemGeometry.setContentBoxHeight(logicalFlexItem.rect.width() - flexItemGeometry.verticalMarginBorderAndPadding());
+        }
     }
 }
@@ -346 +363 @@
 void FlexFormattingContext::computeLogicalWidthForFlexItems(LogicalFlexItems& logicalFlexItemList, const ConstraintsForFlexContent& flexConstraints)
 {
-    auto flexDirection = root().style().flexDirection();
-    auto flexDirectionIsInlineAxis = flexDirection == FlexDirection::Row || flexDirection == FlexDirection::RowReverse;
-    auto availableSpace = std::optional<LayoutUnit> { flexDirectionIsInlineAxis ? std::make_optional(flexConstraints.horizontal().logicalWidth) : flexConstraints.availableVerticalSpace() };
+    auto availableSpace = availableLogicalHorizontalSpace(root(), flexConstraints);
     auto contentLogicalWidth = [&] {
         auto logicalWidth = LayoutUnit { };
@@ -364 +379 @@
 }
 
+void FlexFormattingContext::computeLogicalHeightForFlexItems(LogicalFlexItems& logicalFlexItemList, const ConstraintsForFlexContent& flexConstraints)
+{
+    auto availableSpace = availableLogicalVerticalSpace(root(), flexConstraints);
+    auto alignItems = root().style().alignItems();
+    for (auto& logicalFlexItem : logicalFlexItemList) {
+        auto& height = logicalFlexItem.layoutBox->style().height();
+        if (!height.isAuto())
+            continue;
+        switch (alignItems.position()) {
+        case ItemPosition::Normal:
+        case ItemPosition::Stretch:
+            logicalFlexItem.rect.setHeight(*availableSpace);
+            break;
+        default:
+            ASSERT_NOT_IMPLEMENTED_YET();
+            break;
+        }
+    }
+}
+
 void FlexFormattingContext::layoutInFlowContentForIntegration(const ConstraintsForInFlowContent& constraints)
 {
@@ -373 +408 @@
 
     computeLogicalWidthForFlexItems(logicalFlexItemList, flexConstraints);
+    computeLogicalHeightForFlexItems(logicalFlexItemList, flexConstraints);
 
     for (auto& logicalFlexItem : logicalFlexItemList) {

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

@@ -69 +69 @@
     void computeLogicalWidthForStretchingFlexItems(LogicalFlexItems&, LayoutUnit availableSpace);
     void computeLogicalWidthForShrinkingFlexItems(LogicalFlexItems&, LayoutUnit availableSpace);
+    void computeLogicalHeightForFlexItems(LogicalFlexItems&, const ConstraintsForFlexContent&);
 
     const FlexFormattingState& formattingState() const { return downcast<FlexFormattingState>(FormattingContext::formattingState()); }