Changeset 285495 in webkit

Timestamp:

Nov 9, 2021 6:35:50 AM (8 months ago)

Author:

Alan Bujtas

Message:

Rendering bug with height: min-content, position: absolute, and box-sizing: border-box
​https://bugs.webkit.org/show_bug.cgi?id=232816
<rdar://problem/85154265>

Reviewed by Antti Koivisto.

Source/WebCore:

After r199895, computeIntrinsicLogicalContentHeightUsing started returning the inflated height (content height + border + padding)
as content height for border-box box sizing. While some of the callers expect this inflated height, computePositionedLogicalHeightUsing
needs the actual content height. This is also similar to what we do with the width values.

Test: fast/block/out-of-flow-intrinsic-height.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computePositionedLogicalHeightUsing const):

LayoutTests:

• fast/block/out-of-flow-intrinsic-height-expected.html: Added.
• fast/block/out-of-flow-intrinsic-height.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/out-of-flow-intrinsic-height-expected.html (added)
• LayoutTests/fast/block/out-of-flow-intrinsic-height.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-09  Alan Bujtas  <zalan@apple.com>
+
+        Rendering bug with height: min-content, position: absolute, and box-sizing: border-box
+        https://bugs.webkit.org/show_bug.cgi?id=232816
+        <rdar://problem/85154265>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/block/out-of-flow-intrinsic-height-expected.html: Added.
+        * fast/block/out-of-flow-intrinsic-height.html: Added.
+
 2021-11-09  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-09  Alan Bujtas  <zalan@apple.com>
+
+        Rendering bug with height: min-content, position: absolute, and box-sizing: border-box
+        https://bugs.webkit.org/show_bug.cgi?id=232816
+        <rdar://problem/85154265>
+
+        Reviewed by Antti Koivisto.
+
+        After r199895, computeIntrinsicLogicalContentHeightUsing started returning the inflated height (content height + border + padding)
+        as content height for border-box box sizing. While some of the callers expect this inflated height, computePositionedLogicalHeightUsing
+        needs the actual content height. This is also similar to what we do with the width values.
+
+        Test: fast/block/out-of-flow-intrinsic-height.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computePositionedLogicalHeightUsing const):
+
 2021-11-09  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -4344 +4344 @@
     } else {
         if (logicalHeightLength.isIntrinsic())
-            resolvedLogicalHeight = computeIntrinsicLogicalContentHeightUsing(logicalHeightLength, contentLogicalHeight, bordersPlusPadding).value();
+            resolvedLogicalHeight = adjustContentBoxLogicalHeightForBoxSizing(computeIntrinsicLogicalContentHeightUsing(logicalHeightLength, contentLogicalHeight, bordersPlusPadding).value());
         else if (fromAspectRatio) {
             resolvedLogicalHeight = blockSizeFromAspectRatio(horizontalBorderAndPaddingExtent(), verticalBorderAndPaddingExtent(), LayoutUnit(style().logicalAspectRatio()), style().boxSizingForAspectRatio(), logicalWidth());