Changeset 294983 in webkit

Timestamp:

May 27, 2022 9:10:06 PM (2 years ago)

Author:

Alan Bujtas

Message:

Introduce base-size to the flex algorithm
​https://bugs.webkit.org/show_bug.cgi?id=241001

Reviewed by Antti Koivisto.

This is in preparation for supporting flex-basis, where the flex-basis value is used as the base for flexing.

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

(WebCore::Layout::FlexFormattingContext::computeLogicalWidthForShrinkingFlexItems):
(WebCore::Layout::FlexFormattingContext::computeLogicalWidthForFlexItems):

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

File:

• trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp (modified) (4 diffs)

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

@@ -218 +218 @@
         // don't participate in content flexing.
         for (size_t index = 0; index < logicalFlexItemList.size(); ++index) {
-            auto& logicalFlexItem = logicalFlexItemList[index];
-            if (auto flexShrink = logicalFlexItem.layoutBox->style().flexShrink()) {
+            auto& flexItem = logicalFlexItemList[index];
+            auto baseSize = flexItem.rect.width();
+            if (auto flexShrink = flexItem.layoutBox->style().flexShrink()) {
                 shrinkingItems.append(index);
-                totalShrink += flexShrink;
-                totalFlexibleSpace += logicalFlexItem.rect.width();
+                totalShrink += flexShrink * baseSize;
+                totalFlexibleSpace += baseSize;
             } else
-                availableSpace -= logicalFlexItem.rect.width();
+                availableSpace -= baseSize;
         }
         if (totalShrink)
@@ -237 +238 @@
             auto& flexItem = logicalFlexItemList[flexItemIndex];
 
-            auto flexShrink = flexItem.layoutBox->style().flexShrink();
-            auto flexedSize = flexItem.rect.width() - (flexShrink * flexShrinkBase);
+            auto baseSize = flexItem.rect.width();
+            auto flexShrink = flexItem.layoutBox->style().flexShrink() * baseSize;
+            auto flexedSize = baseSize - (flexShrink * flexShrinkBase);
             auto minimumSize = formattingState.intrinsicWidthConstraintsForBox(*flexItem.layoutBox)->minimum;
             if (minimumSize >= flexedSize) {
                 totalShrink -= flexShrink;
-                totalFlexibleSpace -= flexItem.rect.width();
+                totalFlexibleSpace -= baseSize;
                 availableSpace -= minimumSize;
             }
@@ -255 +257 @@
             auto& flexItem = logicalFlexItemList[flexItemIndex];
 
-            auto flexShrink = flexItem.layoutBox->style().flexShrink();
-            auto flexedSize = LayoutUnit { flexItem.rect.width() - (flexShrink * flexShrinkBase) };
+            auto baseSize = flexItem.rect.width();
+            auto flexShrink = flexItem.layoutBox->style().flexShrink() * baseSize;
+            auto flexedSize = LayoutUnit { baseSize - (flexShrink * flexShrinkBase) };
             auto minimumSize = formattingState.intrinsicWidthConstraintsForBox(*flexItem.layoutBox)->minimum;
             flexItem.rect.setWidth(std::max(minimumSize, flexedSize));
@@ -341 +344 @@
             logicalWidth += logicalFlexItem.rect.width();
         return logicalWidth;
-    };
+    }();
 
     if (!availableSpace)
         ASSERT_NOT_IMPLEMENTED_YET();
-    else if (*availableSpace > contentLogicalWidth())
+    else if (*availableSpace > contentLogicalWidth)
         computeLogicalWidthForStretchingFlexItems(logicalFlexItemList, *availableSpace);
-    else
+    else if (*availableSpace < contentLogicalWidth)
         computeLogicalWidthForShrinkingFlexItems(logicalFlexItemList, *availableSpace);
 }