<!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>[286421] trunk/Source/WebCore</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/286421">286421</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2021-12-02 04:51:10 -0800 (Thu, 02 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Reset height definiteness when constructing flex items
https://bugs.webkit.org/show_bug.cgi?id=233458

Reviewed by Alan Bujtas.

Flexbox renderer uses an attribute called m_hasDefiniteHeight in order to properly
consider as definite some sizes that are normally considered as indefinite. For example,
a percentage of an intrinsic size is normally indefinite unless the containing block has
an overriding size in which case can be considered as definite.

The value of m_hasDefiniteHeight is properly reset every time we construct a flex item or
just after finishing the layout. However we should do it as well just before computing
the flex basis if the flex item is also a flex container. In that case it might happen that
we try to compute the flex basis value with a value for m_hasDefiniteHeight which can
be potentially outdated.

* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutBlock): Use resetHasDefiniteHeight().
(WebCore::RenderFlexibleBox::layoutFlexItems): Ditto.
(WebCore::RenderFlexibleBox::constructFlexItem): Call resetHasDefiniteHeight() if the
flex item is also a flex container.
* rendering/RenderFlexibleBox.h:
(WebCore::RenderFlexibleBox::resetHasDefiniteHeight): Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxh">trunk/Source/WebCore/rendering/RenderFlexibleBox.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286420 => 286421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-02 09:02:26 UTC (rev 286420)
+++ trunk/Source/WebCore/ChangeLog      2021-12-02 12:51:10 UTC (rev 286421)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2021-11-25  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reset height definiteness when constructing flex items
+        https://bugs.webkit.org/show_bug.cgi?id=233458
+
+        Reviewed by Alan Bujtas.
+
+        Flexbox renderer uses an attribute called m_hasDefiniteHeight in order to properly
+        consider as definite some sizes that are normally considered as indefinite. For example,
+        a percentage of an intrinsic size is normally indefinite unless the containing block has
+        an overriding size in which case can be considered as definite.
+
+        The value of m_hasDefiniteHeight is properly reset every time we construct a flex item or
+        just after finishing the layout. However we should do it as well just before computing
+        the flex basis if the flex item is also a flex container. In that case it might happen that
+        we try to compute the flex basis value with a value for m_hasDefiniteHeight which can
+        be potentially outdated.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock): Use resetHasDefiniteHeight().
+        (WebCore::RenderFlexibleBox::layoutFlexItems): Ditto.
+        (WebCore::RenderFlexibleBox::constructFlexItem): Call resetHasDefiniteHeight() if the
+        flex item is also a flex container.
+        * rendering/RenderFlexibleBox.h:
+        (WebCore::RenderFlexibleBox::resetHasDefiniteHeight): Added.
+
</ins><span class="cx"> 2021-12-02  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add support for NavigationPreloadManager
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (286420 => 286421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp     2021-12-02 09:02:26 UTC (rev 286420)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp        2021-12-02 12:51:10 UTC (rev 286421)
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx">     // We have to reset this, because changes to our ancestors' style can affect
</span><span class="cx">     // this value. Also, this needs to be before we call updateAfterLayout, as
</span><span class="cx">     // that function may re-enter this one.
</span><del>-    m_hasDefiniteHeight = SizeDefiniteness::Unknown;
</del><ins>+    resetHasDefiniteHeight();
</ins><span class="cx"> 
</span><span class="cx">     // Update our scroll information if we're overflow:auto/scroll/hidden now that we know if we overflow or not.
</span><span class="cx">     updateScrollInfoAfterLayout();
</span><span class="lines">@@ -1101,7 +1101,7 @@
</span><span class="cx">         }
</span><span class="cx">         allItems.append(constructFlexItem(*child, relayoutChildren));
</span><span class="cx">         // constructFlexItem() might set the override containing block height so any value cached for definiteness might be incorrect.
</span><del>-        m_hasDefiniteHeight = SizeDefiniteness::Unknown;
</del><ins>+        resetHasDefiniteHeight();
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     const LayoutUnit lineBreakLength = mainAxisContentExtent(LayoutUnit::max());
</span><span class="lines">@@ -1450,6 +1450,8 @@
</span><span class="cx"> {
</span><span class="cx">     auto childHadLayout = child.everHadLayout();
</span><span class="cx">     child.clearOverridingContentSize();
</span><ins>+    if (is<RenderFlexibleBox>(child))
+        downcast<RenderFlexibleBox>(child).resetHasDefiniteHeight();
</ins><span class="cx">     
</span><span class="cx">     LayoutUnit borderAndPadding = isHorizontalFlow() ? child.horizontalBorderAndPaddingExtent() : child.verticalBorderAndPaddingExtent();
</span><span class="cx">     LayoutUnit childInnerFlexBaseSize = computeFlexBaseSizeForChild(child, borderAndPadding, relayoutChildren);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.h (286420 => 286421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.h       2021-12-02 09:02:26 UTC (rev 286420)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.h  2021-12-02 12:51:10 UTC (rev 286421)
</span><span class="lines">@@ -201,6 +201,8 @@
</span><span class="cx"> 
</span><span class="cx">     bool childHasPercentHeightDescendants(const RenderBox&) const;
</span><span class="cx"> 
</span><ins>+    void resetHasDefiniteHeight() { m_hasDefiniteHeight = SizeDefiniteness::Unknown; }
+
</ins><span class="cx">     enum class GapType { BetweenLines, BetweenItems };
</span><span class="cx">     LayoutUnit computeGap(GapType) const;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>