Changeset 241646 in webkit

Timestamp:

Feb 16, 2019 4:54:01 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC] Apply min/max width constraints to preferred width computation
​https://bugs.webkit.org/show_bug.cgi?id=194739

Reviewed by Simon Fraser.

Source/WebCore:

Ensure that both min-height and max-height are taken into account while computing the preferred width.

Test: fast/block/block-only/min-max-and-preferred-width-simple.html

• layout/blockformatting/BlockFormattingContextGeometry.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::intrinsicWidthConstraints):

Tools:

• LayoutReloaded/misc/LFC-passing-tests.txt:

LayoutTests:

• fast/block/block-only/min-max-and-preferred-width-simple-expected.html: Added.
• fast/block/block-only/min-max-and-preferred-width-simple.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/block-only/min-max-and-preferred-width-simple-expected.html (added)
• LayoutTests/fast/block/block-only/min-max-and-preferred-width-simple.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/LayoutReloaded/misc/LFC-passing-tests.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-02-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Apply min/max width constraints to preferred width computation
+        https://bugs.webkit.org/show_bug.cgi?id=194739
+
+        Reviewed by Simon Fraser.
+
+        * fast/block/block-only/min-max-and-preferred-width-simple-expected.html: Added.
+        * fast/block/block-only/min-max-and-preferred-width-simple.html: Added.
+
 2019-02-15  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-02-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Apply min/max width constraints to preferred width computation
+        https://bugs.webkit.org/show_bug.cgi?id=194739
+
+        Reviewed by Simon Fraser.
+
+        Ensure that both min-height and max-height are taken into account while computing the preferred width.
+
+        Test: fast/block/block-only/min-max-and-preferred-width-simple.html
+
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        (WebCore::Layout::BlockFormattingContext::Geometry::intrinsicWidthConstraints):
+
 2019-02-15  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp

@@ -291 +291 @@
 FormattingContext::IntrinsicWidthConstraints BlockFormattingContext::Geometry::intrinsicWidthConstraints(const LayoutState& layoutState, const Box& layoutBox)
 {
-    auto& style = layoutBox.style();
-    if (auto width = fixedValue(style.logicalWidth()))
-        return { *width, *width };
-
-    // Minimum/maximum width can't be depending on the containing block's width.
-    if (!style.logicalWidth().isAuto())
-        return { };
-
-    if (!is<Container>(layoutBox))
-        return { };
-
-    auto intrinsicWidthConstraints = IntrinsicWidthConstraints { };
-    for (auto& child : childrenOfType<Box>(downcast<Container>(layoutBox))) {
-        if (child.isOutOfFlowPositioned())
-            continue;
-        auto& formattingState = layoutState.formattingStateForBox(child);
-        ASSERT(formattingState.isBlockFormattingState());
-        auto childIntrinsicWidthConstraints = formattingState.intrinsicWidthConstraints(child);
-        ASSERT(childIntrinsicWidthConstraints);
-        
-        auto& style = child.style();
-        auto horizontalMarginBorderAndPadding = fixedValue(style.marginStart()).valueOr(0)
-            + LayoutUnit { style.borderLeftWidth() }
-            + fixedValue(style.paddingLeft()).valueOr(0)
-            + fixedValue(style.paddingRight()).valueOr(0)
-            + LayoutUnit { style.borderRightWidth() }
-            + fixedValue(style.marginEnd()).valueOr(0);
-
-        intrinsicWidthConstraints.minimum = std::max(intrinsicWidthConstraints.minimum, childIntrinsicWidthConstraints->minimum + horizontalMarginBorderAndPadding);
-        intrinsicWidthConstraints.maximum = std::max(intrinsicWidthConstraints.maximum, childIntrinsicWidthConstraints->maximum + horizontalMarginBorderAndPadding);
-    }
-
-    return constrainByMinMaxWidth(layoutBox, intrinsicWidthConstraints);
+    auto computedIntrinsicWidthConstraints = [&]() -> IntrinsicWidthConstraints {
+        auto& style = layoutBox.style();
+        if (auto width = fixedValue(style.logicalWidth()))
+            return { *width, *width };
+
+        // Minimum/maximum width can't be depending on the containing block's width.
+        if (!style.logicalWidth().isAuto())
+            return { };
+
+        if (!is<Container>(layoutBox))
+            return { };
+
+        auto intrinsicWidthConstraints = IntrinsicWidthConstraints { };
+        for (auto& child : childrenOfType<Box>(downcast<Container>(layoutBox))) {
+            if (child.isOutOfFlowPositioned())
+                continue;
+            const auto& formattingState = layoutState.formattingStateForBox(child);
+            ASSERT(formattingState.isBlockFormattingState());
+            auto childIntrinsicWidthConstraints = formattingState.intrinsicWidthConstraints(child);
+            ASSERT(childIntrinsicWidthConstraints);
+
+            auto& childStyle = child.style();
+            auto marginBorderAndPadding = fixedValue(childStyle.marginStart()).valueOr(0)
+                + LayoutUnit { childStyle.borderLeftWidth() }
+                + fixedValue(childStyle.paddingLeft()).valueOr(0)
+                + fixedValue(childStyle.paddingRight()).valueOr(0)
+                + LayoutUnit { childStyle.borderRightWidth() }
+                + fixedValue(childStyle.marginEnd()).valueOr(0);
+            intrinsicWidthConstraints.minimum = std::max(intrinsicWidthConstraints.minimum, childIntrinsicWidthConstraints->minimum + marginBorderAndPadding);
+            intrinsicWidthConstraints.maximum = std::max(intrinsicWidthConstraints.maximum, childIntrinsicWidthConstraints->maximum + marginBorderAndPadding);
+        }
+        return intrinsicWidthConstraints;
+    };
+
+    return constrainByMinMaxWidth(layoutBox, computedIntrinsicWidthConstraints());
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-02-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Apply min/max width constraints to preferred width computation
+        https://bugs.webkit.org/show_bug.cgi?id=194739
+
+        Reviewed by Simon Fraser.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
 2019-02-15  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt

@@ -98 +98 @@
 fast/block/block-only/margin-sibling-collapse-propagated.html
 fast/block/block-only/margin-simple.html
+fast/block/block-only/min-max-and-preferred-width-simple.html
 fast/block/block-only/min-max-height-percentage.html
 fast/block/block-only/negative-margin-simple.html