Changeset 287779 in webkit

Timestamp:

Jan 7, 2022 1:16:52 PM (6 months ago)

Author:

Alan Bujtas

Message:

Inline blocks that contain text with min-width, box-sizing: border-box incorrectly include the border in width calculation
​https://bugs.webkit.org/show_bug.cgi?id=234935
<rdar://problem/87217423>

Reviewed by Antti Koivisto.

Source/WebCore:

The block formatting context root takes care of applying the the min/max-width constraints.

Test: fast/inline/min-max-width-and-preferred-width.html

• layout/formattingContexts/inline/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraintsForIntegration): remove redundant min/max-width checking.

LayoutTests:

• fast/inline/min-max-width-and-preferred-width-expected.html: Added.
• fast/inline/min-max-width-and-preferred-width.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/min-max-width-and-preferred-width-expected.html (added)
• LayoutTests/fast/inline/min-max-width-and-preferred-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-01-07  Alan Bujtas  <zalan@apple.com>
+
+        Inline blocks that contain text with min-width, box-sizing: border-box incorrectly include the border in width calculation
+        https://bugs.webkit.org/show_bug.cgi?id=234935
+        <rdar://problem/87217423>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/min-max-width-and-preferred-width-expected.html: Added.
+        * fast/inline/min-max-width-and-preferred-width.html: Added.
+
 2022-01-07  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-07  Alan Bujtas  <zalan@apple.com>
+
+        Inline blocks that contain text with min-width, box-sizing: border-box incorrectly include the border in width calculation
+        https://bugs.webkit.org/show_bug.cgi?id=234935
+        <rdar://problem/87217423>
+
+        Reviewed by Antti Koivisto.
+
+        The block formatting context root takes care of applying the the min/max-width constraints.  
+
+        Test: fast/inline/min-max-width-and-preferred-width.html
+
+        * layout/formattingContexts/inline/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraintsForIntegration): remove redundant min/max-width checking.
+
 2022-01-07  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp

@@ -168 +168 @@
     collectContentIfNeeded();
 
-    auto constraints = formattingGeometry().constrainByMinMaxWidth(root(),
-        { ceiledLayoutUnit(computedIntrinsicWidthForConstraint(IntrinsicWidthMode::Minimum))
-        , ceiledLayoutUnit(computedIntrinsicWidthForConstraint(IntrinsicWidthMode::Maximum)) });
+    auto constraints = IntrinsicWidthConstraints {
+        ceiledLayoutUnit(computedIntrinsicWidthForConstraint(IntrinsicWidthMode::Minimum)),
+        ceiledLayoutUnit(computedIntrinsicWidthForConstraint(IntrinsicWidthMode::Maximum))
+    };
     formattingState().setIntrinsicWidthConstraints(constraints);
     return constraints;