Changeset 294755 in webkit

Timestamp:

May 24, 2022 12:12:38 PM (2 years ago)

Author:

Alan Bujtas

Message:

Start using min/max content size for flexing
​https://bugs.webkit.org/show_bug.cgi?id=240872

Reviewed by Antti Koivisto.

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

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

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

(WebCore::LayoutIntegration::FlexLayout::updateFormattingRootGeometryAndInvalidate):
(WebCore::LayoutIntegration::FlexLayout::updateFlexItemDimensions):

• Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.h:
• Source/WebCore/rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutUsingFlexFormattingContext):

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

Location:

trunk/Source/WebCore

Files:

• layout/formattingContexts/flex/FlexFormattingContext.cpp (modified) (3 diffs)
• layout/integration/flex/LayoutIntegrationFlexLayout.cpp (modified) (4 diffs)
• layout/integration/flex/LayoutIntegrationFlexLayout.h (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (1 diff)

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

@@ -207 +207 @@
 void FlexFormattingContext::layoutInFlowContentForIntegration(const ConstraintsForInFlowContent& constraints)
 {
+    auto& formattingState = this->formattingState();
     auto logicalFlexItemList = convertFlexItemsToLogicalSpace();
 
@@ -214 +215 @@
     for (auto& logicalFlexItem : logicalFlexItemList) {
         totalGrowth += logicalFlexItem.layoutBox->style().flexGrow();
-        // FIXME: Use min/max here.
-        totalFixedSpace += logicalFlexItem.rect.width();
+        totalFixedSpace += formattingState.intrinsicWidthConstraintsForBox(*logicalFlexItem.layoutBox)->minimum;
     }
 
@@ -238 +238 @@
             // rest of the flex items in the flex container when positive free space is distributed.
             ASSERT(availableSpace.has_value());
-            logicalFlexItem.rect.setWidth(LayoutUnit { *availableSpace * grow / totalGrowth });
+            // FIXME: This is still slighly incorrect.
+            logicalFlexItem.rect.setWidth(LayoutUnit { formattingState.intrinsicWidthConstraintsForBox(*logicalFlexItem.layoutBox)->minimum + (flexibleSpace * grow / totalGrowth) });
             // FIXME: constrain logical width on min width.
         };

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

@@ -35 +35 @@
 #include "HitTestResult.h"
 #include "LayoutBoxGeometry.h"
+#include "LayoutChildIterator.h"
 #include "RenderFlexibleBox.h"
 
@@ -76 +77 @@
 void FlexLayout::updateFormattingRootGeometryAndInvalidate()
 {
-    auto& flexBoxRenderer = this->flexBoxRenderer();
+    auto updateGeometry = [&](auto& root) {
+        auto& flexBoxRenderer = this->flexBoxRenderer();
 
-    auto updateGeometry = [&](auto& root) {
         auto isLeftToRightInlineDirection = flexBoxRenderer.style().isLeftToRightDirection();
         auto writingMode = flexBoxRenderer.style().writingMode();
@@ -88 +89 @@
         root.setVerticalMargin({ });
     };
-    return updateGeometry(m_layoutState.ensureGeometryForBox(rootLayoutBox()));
+    updateGeometry(m_layoutState.ensureGeometryForBox(rootLayoutBox()));
+
+    for (auto& flexItem : Layout::childrenOfType<Layout::Box>(rootLayoutBox()))
+        m_flexFormattingState.clearIntrinsicWidthConstraints(flexItem);
 }
 
-void FlexLayout::updateFlexItemDimensions(const RenderBlock& flexItem)
+void FlexLayout::updateFlexItemDimensions(const RenderBlock& flexItem, LayoutUnit minimumContentSize, LayoutUnit maximumContentSize)
 {
-    auto& boxGeometry = m_layoutState.ensureGeometryForBox(m_boxTree.layoutBoxForRenderer(flexItem));
+    auto& layoutBox = m_boxTree.layoutBoxForRenderer(flexItem);
+    auto& boxGeometry = m_layoutState.ensureGeometryForBox(layoutBox);
 
     boxGeometry.setContentBoxWidth(flexItem.contentWidth());
@@ -101 +106 @@
     boxGeometry.setBorder({ { flexItem.borderLeft(), flexItem.borderRight() }, { flexItem.borderTop(), flexItem.borderBottom() } });
     boxGeometry.setPadding(Layout::Edges { { flexItem.paddingLeft(), flexItem.paddingRight() }, { flexItem.paddingTop(), flexItem.paddingBottom() } });
+
+    // FIXME: We may need to differentiate preferred and min/max content size.
+    m_flexFormattingState.setIntrinsicWidthConstraintsForBox(layoutBox, { minimumContentSize, maximumContentSize });
 }
 

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

@@ -52 +52 @@
 
     void updateFormattingRootGeometryAndInvalidate();
-    void updateFlexItemDimensions(const RenderBlock&);
+    void updateFlexItemDimensions(const RenderBlock& flexItem, LayoutUnit minimumContentSize, LayoutUnit maximumContentSize);
     void updateStyle(const RenderBlock&, const RenderStyle& oldStyle);
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -2357 +2357 @@
     for (auto& flexItem : childrenOfType<RenderBlock>(*this)) {
         flexItem.layoutIfNeeded();
-        m_flexLayout->updateFlexItemDimensions(flexItem);
+        auto minMaxContentSize = computeFlexItemMinMaxSizes(flexItem);
+        m_flexLayout->updateFlexItemDimensions(flexItem, minMaxContentSize.first, minMaxContentSize.second);
     }
     m_flexLayout->layout();