Changeset 263260 in webkit

Timestamp:

Jun 19, 2020, 5:43:03 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][BFC] Min/max-width should always be resolved against the containing block width
​https://bugs.webkit.org/show_bug.cgi?id=213365

Reviewed by Antti Koivisto.

Source/WebCore:

Even when neighboring floats shrink the available horizontal space, the min/max(normal) widths should
be resolved against the containing block's logical width.

Test: fast/layoutformattingcontext/float-avoider-available-horizontal-space2.html

• layout/blockformatting/BlockFormattingContext.cpp:

(WebCore::Layout::BlockFormattingContext::computeWidthAndMargin):

• layout/blockformatting/BlockFormattingContext.h:
• layout/blockformatting/BlockFormattingContextGeometry.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::computedWidthAndMargin):

• layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp:

(WebCore::Layout::TableWrapperBlockFormattingContext::computeWidthAndMarginForTableBox):

LayoutTests:

• fast/layoutformattingcontext/float-avoider-available-horizontal-space2-expected.html: Added.
• fast/layoutformattingcontext/float-avoider-available-horizontal-space2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/float-avoider-available-horizontal-space2-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/float-avoider-available-horizontal-space2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (modified) (1 diff)
• Source/WebCore/layout/blockformatting/BlockFormattingContext.h (modified) (1 diff)
• Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp (modified) (3 diffs)
• Source/WebCore/layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-06-19  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC] Min/max-width should always be resolved against the containing block width
+        https://bugs.webkit.org/show_bug.cgi?id=213365
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/float-avoider-available-horizontal-space2-expected.html: Added.
+        * fast/layoutformattingcontext/float-avoider-available-horizontal-space2.html: Added.
+
 2020-06-19  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-19  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC] Min/max-width should always be resolved against the containing block width
+        https://bugs.webkit.org/show_bug.cgi?id=213365
+
+        Reviewed by Antti Koivisto.
+
+        Even when neighboring floats shrink the available horizontal space, the min/max(normal) widths should
+        be resolved against the containing block's logical width.
+
+        Test: fast/layoutformattingcontext/float-avoider-available-horizontal-space2.html
+
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::computeWidthAndMargin):
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        (WebCore::Layout::BlockFormattingContext::Geometry::computedWidthAndMargin):
+        * layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp:
+        (WebCore::Layout::TableWrapperBlockFormattingContext::computeWidthAndMarginForTableBox):
+
 2020-06-10  Sergio Villar Senin  <svillar@igalia.com>
 

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

@@ -315 +315 @@
 void BlockFormattingContext::computeWidthAndMargin(const FloatingContext& floatingContext, const Box& layoutBox, const ConstraintsPair& constraintsPair)
 {
-    auto adjustedConstraints = constraintsPair;
-    if (layoutBox.isFloatAvoider() && layoutBox.style().logicalWidth().isAuto()) {
+    auto availableWidthFloatAvoider = Optional<LayoutUnit> { };
+    if (layoutBox.isFloatAvoider()) {
         // Float avoiders' available width might be shrunk by existing floats in the context.
-        if (auto availableWidthForFloatAvoider = usedAvailableWidthForFloatAvoider(floatingContext, layoutBox, constraintsPair))
-            adjustedConstraints.containingBlock.horizontal.logicalWidth = *availableWidthForFloatAvoider;
-    }
-
-    auto contentWidthAndMargin = geometry().computedWidthAndMargin(layoutBox, adjustedConstraints);
+        availableWidthFloatAvoider = usedAvailableWidthForFloatAvoider(floatingContext, layoutBox, constraintsPair);
+    }
+    auto contentWidthAndMargin = geometry().computedWidthAndMargin(layoutBox, constraintsPair.containingBlock.horizontal, availableWidthFloatAvoider);
     auto& displayBox = formattingState().displayBox(layoutBox);
     displayBox.setContentBoxWidth(contentWidthAndMargin.contentWidth);

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h

@@ -86 +86 @@
         IntrinsicWidthConstraints intrinsicWidthConstraints(const Box&);
 
-        ContentWidthAndMargin computedWidthAndMargin(const Box&, const ConstraintsPair&);
+        ContentWidthAndMargin computedWidthAndMargin(const Box&, const HorizontalConstraints&, Optional<LayoutUnit> availableWidthFloatAvoider);
 
     private:

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

@@ -284 +284 @@
 }
 
-ContentWidthAndMargin BlockFormattingContext::Geometry::computedWidthAndMargin(const Box& layoutBox, const ConstraintsPair& constraintsPair)
-{
-    auto& horizontalConstraints = constraintsPair.containingBlock.horizontal;
-    auto compute = [&](Optional<LayoutUnit> usedWidth) {
+ContentWidthAndMargin BlockFormattingContext::Geometry::computedWidthAndMargin(const Box& layoutBox, const HorizontalConstraints& horizontalConstraints, Optional<LayoutUnit> availableWidthFloatAvoider)
+{
+    auto compute = [&] (auto constraintsForWidth, Optional<LayoutUnit> usedWidth) {
         if (layoutBox.isFloatingPositioned())
-            return floatingWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth, { } });
+            return floatingWidthAndMargin(layoutBox, constraintsForWidth, { usedWidth, { } });
 
         if (layoutBox.isInFlow())
-            return inFlowWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth, { } });
+            return inFlowWidthAndMargin(layoutBox, constraintsForWidth, { usedWidth, { } });
 
         ASSERT_NOT_REACHED();
@@ -298 +297 @@
     };
 
-    auto contentWidthAndMargin = compute({ });
-
+    auto horizontalConstraintsForWidth = horizontalConstraints;
+    if (layoutBox.style().logicalWidth().isAuto() && availableWidthFloatAvoider) {
+        // While the non-auto width values should all be resolved against the containing block's width, when
+        // the width is auto the available horizontal space is shrunk by neighboring floats.
+        horizontalConstraintsForWidth.logicalWidth = *availableWidthFloatAvoider;
+    }
+    auto contentWidthAndMargin = compute(horizontalConstraintsForWidth, { });
     auto availableWidth = horizontalConstraints.logicalWidth;
     if (auto maxWidth = computedMaxWidth(layoutBox, availableWidth)) {
-        auto maxWidthAndMargin = compute(maxWidth);
+        auto maxWidthAndMargin = compute(horizontalConstraints, maxWidth);
         if (contentWidthAndMargin.contentWidth > maxWidthAndMargin.contentWidth)
             contentWidthAndMargin = maxWidthAndMargin;
@@ -308 +312 @@
 
     auto minWidth = computedMinWidth(layoutBox, availableWidth).valueOr(0);
-    auto minWidthAndMargin = compute(minWidth);
+    auto minWidthAndMargin = compute(horizontalConstraints, minWidth);
     if (contentWidthAndMargin.contentWidth < minWidthAndMargin.contentWidth)
         contentWidthAndMargin = minWidthAndMargin;

trunk/Source/WebCore/layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp

@@ -146 +146 @@
     ASSERT(tableBox.isTableBox());
     if (!tableBox.hasChild()) {
-        auto constraintsPair = ConstraintsPair { { horizontalConstraints, { } }, { horizontalConstraints, { } } };
-        auto computedWidthAndMargin = geometry().computedWidthAndMargin(tableBox, constraintsPair);
+        auto computedWidthAndMargin = geometry().computedWidthAndMargin(tableBox, horizontalConstraints, { });
         auto& displayBox = formattingState().displayBox(tableBox);
         displayBox.setContentBoxWidth(computedWidthAndMargin.contentWidth);