Changeset 294638 in webkit

Timestamp:

May 23, 2022 6:49:05 AM (2 years ago)

Author:

Alan Bujtas

Message:

Add support for block direction grow
​https://bugs.webkit.org/show_bug.cgi?id=240776

Reviewed by Antti Koivisto.

This is a basic block direction grow support (e.g. default block direction (top->bottom) with flex direction of column) when
flex box's height is fixed.

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

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

• Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp:

(WebCore::LayoutIntegration::FlexLayout::updateRenderers const):

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

Location:

trunk/Source/WebCore/layout

Files:

• formattingContexts/FormattingConstraints.h (modified) (1 diff)
• formattingContexts/flex/FlexFormattingContext.cpp (modified) (3 diffs)
• integration/flex/LayoutIntegrationFlexLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/layout/formattingContexts/FormattingConstraints.h

@@ -67 +67 @@
     OptionSet<BaseTypeFlag> baseTypeFlags() const { return OptionSet<BaseTypeFlag>::fromRaw(m_baseTypeFlags); }
 
-    unsigned m_baseTypeFlags : 2; // OptionSet<BaseTypeFlag>
+    unsigned m_baseTypeFlags : 3; // OptionSet<BaseTypeFlag>
     HorizontalConstraints m_horizontal;
     LayoutUnit m_logicalTop;

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

@@ -210 +210 @@
 
     auto totalGrowth = 0.f;
-    auto totalFixedWidth = LayoutUnit { };
+    auto totalFixedSpace = LayoutUnit { };
 
     for (auto& logicalFlexItem : logicalFlexItemList) {
         totalGrowth += logicalFlexItem.layoutBox->style().flexGrow();
         // FIXME: Use min/max here.
-        totalFixedWidth += logicalFlexItem.rect.width();
-    }
-
+        totalFixedSpace += logicalFlexItem.rect.width();
+    }
+
+    auto flexConstraints = downcast<ConstraintsForFlexContent>(constraints);
     auto logicalLeft = LayoutUnit { };
     auto logicalTop = LayoutUnit { };
-    auto availableWidth = constraints.horizontal().logicalWidth;
-    auto flexibleWidth = availableWidth - totalFixedWidth;
+    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 flexibleSpace = availableSpace.value_or(0_lu) - totalFixedSpace;
 
     for (auto& logicalFlexItem : logicalFlexItemList) {
@@ -227 +230 @@
         logicalLeft = logicalFlexItem.rect.right();
         auto growFlexItemIfApplicable = [&] {
-            if (flexibleWidth <= 0)
+            if (flexibleSpace <= 0)
                 return;
             auto grow = logicalFlexItem.layoutBox->style().flexGrow();
@@ -234 +237 @@
             // This value specifies the flex grow factor, which determines how much the flex item will grow relative to the
             // rest of the flex items in the flex container when positive free space is distributed.
-            logicalFlexItem.rect.setWidth(LayoutUnit { availableWidth * grow / totalGrowth });
+            ASSERT(availableSpace.has_value());
+            logicalFlexItem.rect.setWidth(LayoutUnit { *availableSpace * grow / totalGrowth });
             // FIXME: constrain logical width on min width.
         };
         growFlexItemIfApplicable();
     }
-    setFlexItemsGeometry(logicalFlexItemList, downcast<ConstraintsForFlexContent>(constraints));
+    setFlexItemsGeometry(logicalFlexItemList, flexConstraints);
 }
 

trunk/Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp

@@ -140 +140 @@
         renderer.setLocation(borderBox.topLeft());
         renderer.setWidth(borderBox.width());
+        renderer.setHeight(borderBox.height());
     }
 }