Changeset 294996 in webkit

Timestamp:

May 28, 2022 6:21:48 AM (2 years ago)

Author:

Alan Bujtas

Message:

Use flex-basis when shrinking flex items
​https://bugs.webkit.org/show_bug.cgi?id=241046

Reviewed by Antti Koivisto.

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

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

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

File:

• trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp (modified) (1 diff)

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

@@ -227 +227 @@
         for (size_t index = 0; index < logicalFlexItemList.size(); ++index) {
             auto& flexItem = logicalFlexItemList[index];
-            auto baseSize = flexItem.rect.width();
-            if (auto shrinkValue = flexItem.layoutBox->style().flexShrink()) {
+            auto& style = flexItem.layoutBox->style();
+            auto baseSize = style.flexBasis().isFixed() ? LayoutUnit { style.flexBasis().value() } : flexItem.rect.width();
+            if (auto shrinkValue = style.flexShrink()) {
                 auto flexShrink = shrinkValue * baseSize;
                 shrinkingItems.append({ flexShrink, formattingState.intrinsicWidthConstraintsForBox(*flexItem.layoutBox)->minimum, baseSize, flexItem, { } });