<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[285495] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/285495">285495</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-11-09 06:35:50 -0800 (Tue, 09 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>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 <a href="http://trac.webkit.org/projects/webkit/changeset/199895">r199895</a>, 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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastblockoutofflowintrinsicheightexpectedhtml">trunk/LayoutTests/fast/block/out-of-flow-intrinsic-height-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastblockoutofflowintrinsicheighthtml">trunk/LayoutTests/fast/block/out-of-flow-intrinsic-height.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (285494 => 285495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-11-09 14:31:38 UTC (rev 285494)
+++ trunk/LayoutTests/ChangeLog 2021-11-09 14:35:50 UTC (rev 285495)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
</ins><span class="cx"> 2021-11-09  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, reverting r285486.
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockoutofflowintrinsicheightexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/out-of-flow-intrinsic-height-expected.html (0 => 285495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/out-of-flow-intrinsic-height-expected.html                          (rev 0)
+++ trunk/LayoutTests/fast/block/out-of-flow-intrinsic-height-expected.html     2021-11-09 14:35:50 UTC (rev 285495)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<style>
+div {
+  width: 220px;
+  height: 220px;
+  background-color: green;
+}
+</style>
+<div></div>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastblockoutofflowintrinsicheighthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/out-of-flow-intrinsic-height.html (0 => 285495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/out-of-flow-intrinsic-height.html                           (rev 0)
+++ trunk/LayoutTests/fast/block/out-of-flow-intrinsic-height.html      2021-11-09 14:35:50 UTC (rev 285495)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<style>
+.test {
+  width: 220px;
+  height: min-content;
+  border: 100px solid green;
+  position: absolute;
+  box-sizing: border-box;
+}
+.content {
+  width: 20px;
+  height: 20px;
+  background-color: green;
+}
+
+.fail {
+  position: absolute;
+  width: 220px;
+  height: 220px;
+  background-color: red;
+}
+</style>
+<!-- PASS if no red -->
+<div class=fail></div>
+<div class=test><div class=content></div></div>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285494 => 285495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-09 14:31:38 UTC (rev 285494)
+++ trunk/Source/WebCore/ChangeLog      2021-11-09 14:35:50 UTC (rev 285495)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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):
+
</ins><span class="cx"> 2021-11-09  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, reverting r285436.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (285494 => 285495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp     2021-11-09 14:31:38 UTC (rev 285494)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp        2021-11-09 14:35:50 UTC (rev 285495)
</span><span class="lines">@@ -4343,7 +4343,7 @@
</span><span class="cx">         logicalHeightIsAuto = false;
</span><span class="cx">     } else {
</span><span class="cx">         if (logicalHeightLength.isIntrinsic())
</span><del>-            resolvedLogicalHeight = computeIntrinsicLogicalContentHeightUsing(logicalHeightLength, contentLogicalHeight, bordersPlusPadding).value();
</del><ins>+            resolvedLogicalHeight = adjustContentBoxLogicalHeightForBoxSizing(computeIntrinsicLogicalContentHeightUsing(logicalHeightLength, contentLogicalHeight, bordersPlusPadding).value());
</ins><span class="cx">         else if (fromAspectRatio) {
</span><span class="cx">             resolvedLogicalHeight = blockSizeFromAspectRatio(horizontalBorderAndPaddingExtent(), verticalBorderAndPaddingExtent(), LayoutUnit(style().logicalAspectRatio()), style().boxSizingForAspectRatio(), logicalWidth());
</span><span class="cx">             resolvedLogicalHeight = std::max(LayoutUnit(), resolvedLogicalHeight - bordersPlusPadding);
</span></span></pre>
</div>
</div>

</body>
</html>