<!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>[277310] branches/safari-612.1.14-branch</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/277310">277310</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-05-10 17:35:40 -0700 (Mon, 10 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/277297">r277297</a>. rdar://problem/77797456

    Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/277222">r277222</a>.
    https://bugs.webkit.org/show_bug.cgi?id=225618

    WebContent process crashes while visiting
    <http://ign.com|ign.com> (RenderFlexibleBox::layoutFlexItems)

    Reverted changeset:

    "[css-flexbox] Flex item construction may affect sibling flex
    item height computation"
    https://bugs.webkit.org/show_bug.cgi?id=225489
    https://trac.webkit.org/changeset/277222

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277297 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612114branchLayoutTestsChangeLog">branches/safari-612.1.14-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari612114branchSourceWebCoreChangeLog">branches/safari-612.1.14-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612114branchSourceWebCorerenderingRenderFlexibleBoxcpp">branches/safari-612.1.14-branch/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#branchessafari612114branchSourceWebCorerenderingRenderFlexibleBoxh">branches/safari-612.1.14-branch/Source/WebCore/rendering/RenderFlexibleBox.h</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari612114branchLayoutTestsfastflexboxflexcolumnwithpercentheightdescendantsexpectedhtml">branches/safari-612.1.14-branch/LayoutTests/fast/flexbox/flex-column-with-percent-height-descendants-expected.html</a></li>
<li><a href="#branchessafari612114branchLayoutTestsfastflexboxflexcolumnwithpercentheightdescendantshtml">branches/safari-612.1.14-branch/LayoutTests/fast/flexbox/flex-column-with-percent-height-descendants.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612114branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.14-branch/LayoutTests/ChangeLog (277309 => 277310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.14-branch/LayoutTests/ChangeLog    2021-05-11 00:25:26 UTC (rev 277309)
+++ branches/safari-612.1.14-branch/LayoutTests/ChangeLog       2021-05-11 00:35:40 UTC (rev 277310)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2021-05-10  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r277297. rdar://problem/77797456
+
+    Unreviewed, reverting r277222.
+    https://bugs.webkit.org/show_bug.cgi?id=225618
+    
+    WebContent process crashes while visiting
+    <http://ign.com|ign.com> (RenderFlexibleBox::layoutFlexItems)
+    
+    Reverted changeset:
+    
+    "[css-flexbox] Flex item construction may affect sibling flex
+    item height computation"
+    https://bugs.webkit.org/show_bug.cgi?id=225489
+    https://trac.webkit.org/changeset/277222
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277297 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-05-10  Commit Queue  <commit-queue@webkit.org>
+
+            Unreviewed, reverting r277222.
+            https://bugs.webkit.org/show_bug.cgi?id=225618
+
+            WebContent process crashes while visiting
+            <http://ign.com|ign.com> (RenderFlexibleBox::layoutFlexItems)
+
+            Reverted changeset:
+
+            "[css-flexbox] Flex item construction may affect sibling flex
+            item height computation"
+            https://bugs.webkit.org/show_bug.cgi?id=225489
+            https://trac.webkit.org/changeset/277222
+
</ins><span class="cx"> 2021-05-08  Ricky Mondello  <rmondello@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix a typo
</span></span></pre></div>
<a id="branchessafari612114branchLayoutTestsfastflexboxflexcolumnwithpercentheightdescendantsexpectedhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-612.1.14-branch/LayoutTests/fast/flexbox/flex-column-with-percent-height-descendants-expected.html (277309 => 277310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.14-branch/LayoutTests/fast/flexbox/flex-column-with-percent-height-descendants-expected.html       2021-05-11 00:25:26 UTC (rev 277309)
+++ branches/safari-612.1.14-branch/LayoutTests/fast/flexbox/flex-column-with-percent-height-descendants-expected.html  2021-05-11 00:35:40 UTC (rev 277310)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<!DOCTYPE html>
-<style>
-div {
-  height: 100px;
-  background-color: green;
-}
-</style>
-<div></div>
</del></span></pre></div>
<a id="branchessafari612114branchLayoutTestsfastflexboxflexcolumnwithpercentheightdescendantshtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-612.1.14-branch/LayoutTests/fast/flexbox/flex-column-with-percent-height-descendants.html (277309 => 277310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.14-branch/LayoutTests/fast/flexbox/flex-column-with-percent-height-descendants.html        2021-05-11 00:25:26 UTC (rev 277309)
+++ branches/safari-612.1.14-branch/LayoutTests/fast/flexbox/flex-column-with-percent-height-descendants.html   2021-05-11 00:35:40 UTC (rev 277310)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-<!DOCTYPE html>
-<style>
-.flexContainer {
-  display: flex;
-  flex-direction: column;
-  position: relative;
-  height: 100px;
-}
-.firstChild {
-  background-color: yellow;
-  height: 50px;
-}
-.secondChild {
-  height: 50%;
-  background-color: green;
-}
-.percentHeightDescendant {
-  height: 100%;
-  background-color: green
-}
-</style>
-<div class=flexContainer>
-  <div class=firstChild><div class=percentHeightDescendant></div></div>
-  <div class=secondChild></div>
-</div>
</del></span></pre></div>
<a id="branchessafari612114branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.14-branch/Source/WebCore/ChangeLog (277309 => 277310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.14-branch/Source/WebCore/ChangeLog 2021-05-11 00:25:26 UTC (rev 277309)
+++ branches/safari-612.1.14-branch/Source/WebCore/ChangeLog    2021-05-11 00:35:40 UTC (rev 277310)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2021-05-10  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r277297. rdar://problem/77797456
+
+    Unreviewed, reverting r277222.
+    https://bugs.webkit.org/show_bug.cgi?id=225618
+    
+    WebContent process crashes while visiting
+    <http://ign.com|ign.com> (RenderFlexibleBox::layoutFlexItems)
+    
+    Reverted changeset:
+    
+    "[css-flexbox] Flex item construction may affect sibling flex
+    item height computation"
+    https://bugs.webkit.org/show_bug.cgi?id=225489
+    https://trac.webkit.org/changeset/277222
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277297 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-05-10  Commit Queue  <commit-queue@webkit.org>
+
+            Unreviewed, reverting r277222.
+            https://bugs.webkit.org/show_bug.cgi?id=225618
+
+            WebContent process crashes while visiting
+            <http://ign.com|ign.com> (RenderFlexibleBox::layoutFlexItems)
+
+            Reverted changeset:
+
+            "[css-flexbox] Flex item construction may affect sibling flex
+            item height computation"
+            https://bugs.webkit.org/show_bug.cgi?id=225489
+            https://trac.webkit.org/changeset/277222
+
</ins><span class="cx"> 2021-05-09  Lauro Moura  <lmoura@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WebXR] Remove reference cycle in WebXRSession
</span></span></pre></div>
<a id="branchessafari612114branchSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.14-branch/Source/WebCore/rendering/RenderFlexibleBox.cpp (277309 => 277310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.14-branch/Source/WebCore/rendering/RenderFlexibleBox.cpp   2021-05-11 00:25:26 UTC (rev 277309)
+++ branches/safari-612.1.14-branch/Source/WebCore/rendering/RenderFlexibleBox.cpp      2021-05-11 00:35:40 UTC (rev 277310)
</span><span class="lines">@@ -268,6 +268,9 @@
</span><span class="cx">     resetLogicalHeightBeforeLayoutIfNeeded();
</span><span class="cx">     m_relaidOutChildren.clear();
</span><span class="cx">     
</span><ins>+    bool oldInLayout = m_inLayout;
+    m_inLayout = true;
+    
</ins><span class="cx">     if (recomputeLogicalWidth())
</span><span class="cx">         relayoutChildren = true;
</span><span class="cx"> 
</span><span class="lines">@@ -318,6 +321,8 @@
</span><span class="cx">     repainter.repaintAfterLayout();
</span><span class="cx"> 
</span><span class="cx">     clearNeedsLayout();
</span><ins>+    
+    m_inLayout = oldInLayout;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderFlexibleBox::appendChildFrameRects(ChildFrameRects& childFrameRects)
</span><span class="lines">@@ -840,7 +845,7 @@
</span><span class="cx">     if (m_hasDefiniteHeight == SizeDefiniteness::Indefinite)
</span><span class="cx">         return false;
</span><span class="cx">     bool definite = child.computePercentageLogicalHeight(flexBasis, updateDescendants).hasValue();
</span><del>-    if (!m_inFlexItemConstruction && (isHorizontalWritingMode() == child.isHorizontalWritingMode())) {
</del><ins>+    if (m_inLayout && (isHorizontalWritingMode() == child.isHorizontalWritingMode())) {
</ins><span class="cx">         // We can reach this code even while we're not laying ourselves out, such
</span><span class="cx">         // as from mainSizeForPercentageResolution.
</span><span class="cx">         m_hasDefiniteHeight = definite ? SizeDefiniteness::Definite : SizeDefiniteness::Indefinite;
</span><span class="lines">@@ -960,7 +965,21 @@
</span><span class="cx">     // Set up our master list of flex items. All of the rest of the algorithm
</span><span class="cx">     // should work off this list of a subset.
</span><span class="cx">     // TODO(cbiesinger): That second part is not yet true.
</span><del>-    auto allItems = constructFlexItems(relayoutChildren);
</del><ins>+    Vector<FlexItem> allItems;
+    m_orderIterator.first();
+    for (RenderBox* child = m_orderIterator.currentChild(); child; child = m_orderIterator.next()) {
+        if (m_orderIterator.shouldSkipChild(*child)) {
+            // Out-of-flow children are not flex items, so we skip them here.
+            if (child->isOutOfFlowPositioned())
+                prepareChildForPositionedLayout(*child);
+            continue;
+        }
+        allItems.append(constructFlexItem(*child, relayoutChildren));
+    }
+
+    // constructFlexItem() might set the override containing block height so any value cached for definiteness might be incorrect.
+    m_hasDefiniteHeight = SizeDefiniteness::Unknown;
+    
</ins><span class="cx">     const LayoutUnit lineBreakLength = mainAxisContentExtent(LayoutUnit::max());
</span><span class="cx">     LayoutUnit gapBetweenItems = computeGap(GapType::BetweenItems);
</span><span class="cx">     LayoutUnit gapBetweenLines = computeGap(GapType::BetweenLines);
</span><span class="lines">@@ -1275,52 +1294,36 @@
</span><span class="cx">     return childSize;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Vector<FlexItem> RenderFlexibleBox::constructFlexItems(bool relayoutChildren)
</del><ins>+FlexItem RenderFlexibleBox::constructFlexItem(RenderBox& child, bool relayoutChildren)
</ins><span class="cx"> {
</span><del>-    SetForScope<bool> inFlexItemConstruction(m_inFlexItemConstruction, true);
-
-    Vector<FlexItem> flexItems;
-    for (auto* child = m_orderIterator.first(); child; child = m_orderIterator.next()) {
-        if (m_orderIterator.shouldSkipChild(*child)) {
-            // Out-of-flow children are not flex items, so we skip them here.
-            if (child->isOutOfFlowPositioned())
-                prepareChildForPositionedLayout(*child);
-            continue;
</del><ins>+    child.clearOverridingContentSize();
+    if (childHasIntrinsicMainAxisSize(child)) {
+        // If this condition is true, then computeMainAxisExtentForChild will call
+        // child.intrinsicContentLogicalHeight() and child.scrollbarLogicalHeight(),
+        // so if the child has intrinsic min/max/preferred size, run layout on it now to make sure
+        // its logical height and scroll bars are up to date.
+        updateBlockChildDirtyBitsBeforeLayout(relayoutChildren, child);
+        // Don't resolve percentages in children. This is especially important for the min-height calculation,
+        // where we want percentages to be treated as auto. For flex-basis itself, this is not a problem because
+        // by definition we have an indefinite flex basis here and thus percentages should not resolve.
+        if (child.needsLayout() || !m_intrinsicSizeAlongMainAxis.contains(&child)) {
+            if (isHorizontalWritingMode() == child.isHorizontalWritingMode())
+                child.setOverridingContainingBlockContentLogicalHeight(WTF::nullopt);
+            else
+                child.setOverridingContainingBlockContentLogicalWidth(WTF::nullopt);
+            child.clearOverridingContentSize();
+            child.setChildNeedsLayout(MarkOnlyThis);
+            child.layoutIfNeeded();
+            cacheChildMainSize(child);
+            child.clearOverridingContainingBlockContentSize();
</ins><span class="cx">         }
</span><del>-
-        auto constructFlexItemForChildBox = [&](auto& childBox) {
-            childBox.clearOverridingContentSize();
-            if (childHasIntrinsicMainAxisSize(childBox)) {
-                // If this condition is true, then computeMainAxisExtentForChild will call
-                // child.intrinsicContentLogicalHeight() and child.scrollbarLogicalHeight(),
-                // so if the child has intrinsic min/max/preferred size, run layout on it now to make sure
-                // its logical height and scroll bars are up to date.
-                updateBlockChildDirtyBitsBeforeLayout(relayoutChildren, childBox);
-                // Don't resolve percentages in children. This is especially important for the min-height calculation,
-                // where we want percentages to be treated as auto. For flex-basis itself, this is not a problem because
-                // by definition we have an indefinite flex basis here and thus percentages should not resolve.
-                if (childBox.needsLayout() || !m_intrinsicSizeAlongMainAxis.contains(&childBox)) {
-                    if (isHorizontalWritingMode() == childBox.isHorizontalWritingMode())
-                        childBox.setOverridingContainingBlockContentLogicalHeight(WTF::nullopt);
-                    else
-                        childBox.setOverridingContainingBlockContentLogicalWidth(WTF::nullopt);
-                    childBox.clearOverridingContentSize();
-                    childBox.setChildNeedsLayout(MarkOnlyThis);
-                    childBox.layoutIfNeeded();
-                    cacheChildMainSize(childBox);
-                    childBox.clearOverridingContainingBlockContentSize();
-                }
-            }
-
-            auto borderAndPadding = isHorizontalFlow() ? childBox.horizontalBorderAndPaddingExtent() : childBox.verticalBorderAndPaddingExtent();
-            auto childInnerFlexBaseSize = computeInnerFlexBaseSizeForChild(childBox, borderAndPadding);
-            auto childMinMaxAppliedMainAxisExtent = adjustChildSizeForMinAndMax(childBox, childInnerFlexBaseSize);
-            auto margin = isHorizontalFlow() ? childBox.horizontalMarginExtent() : childBox.verticalMarginExtent();
-            return FlexItem(childBox, childInnerFlexBaseSize, childMinMaxAppliedMainAxisExtent, borderAndPadding, margin);
-        };
-        flexItems.append(constructFlexItemForChildBox(*child));
</del><span class="cx">     }
</span><del>-    return flexItems;
</del><ins>+    
+    LayoutUnit borderAndPadding = isHorizontalFlow() ? child.horizontalBorderAndPaddingExtent() : child.verticalBorderAndPaddingExtent();
+    LayoutUnit childInnerFlexBaseSize = computeInnerFlexBaseSizeForChild(child, borderAndPadding);
+    LayoutUnit childMinMaxAppliedMainAxisExtent = adjustChildSizeForMinAndMax(child, childInnerFlexBaseSize);
+    LayoutUnit margin = isHorizontalFlow() ? child.horizontalMarginExtent() : child.verticalMarginExtent();
+    return FlexItem(child, childInnerFlexBaseSize, childMinMaxAppliedMainAxisExtent, borderAndPadding, margin);
</ins><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> void RenderFlexibleBox::freezeViolations(Vector<FlexItem*>& violations, LayoutUnit& availableFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink)
</span></span></pre></div>
<a id="branchessafari612114branchSourceWebCorerenderingRenderFlexibleBoxh"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.14-branch/Source/WebCore/rendering/RenderFlexibleBox.h (277309 => 277310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.14-branch/Source/WebCore/rendering/RenderFlexibleBox.h     2021-05-11 00:25:26 UTC (rev 277309)
+++ branches/safari-612.1.14-branch/Source/WebCore/rendering/RenderFlexibleBox.h        2021-05-11 00:35:40 UTC (rev 277310)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">     void prepareOrderIteratorAndMargins();
</span><span class="cx">     LayoutUnit adjustChildSizeForMinAndMax(RenderBox& child, LayoutUnit childSize);
</span><span class="cx">     LayoutUnit adjustChildSizeForAspectRatioCrossAxisMinAndMax(const RenderBox& child, LayoutUnit childSize);
</span><del>-    Vector<FlexItem> constructFlexItems(bool relayoutChildren);
</del><ins>+    FlexItem constructFlexItem(RenderBox&, bool relayoutChildren);
</ins><span class="cx">     
</span><span class="cx">     void freezeInflexibleItems(FlexSign, Vector<FlexItem>& children, LayoutUnit& remainingFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink);
</span><span class="cx">     bool resolveFlexibleLengths(FlexSign, Vector<FlexItem>&, LayoutUnit initialFreeSpace, LayoutUnit& remainingFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink);
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">     
</span><span class="cx">     // This is SizeIsUnknown outside of layoutBlock()
</span><span class="cx">     SizeDefiniteness m_hasDefiniteHeight { SizeDefiniteness::Unknown };
</span><del>-    bool m_inFlexItemConstruction { false };
</del><ins>+    bool m_inLayout { false };
</ins><span class="cx">     bool m_shouldResetChildLogicalHeightBeforeLayout { false };
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>