<!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>[285857] 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/285857">285857</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-11-16 03:41:05 -0800 (Tue, 16 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/280078">r280078</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/280290">r280290</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/282008">r282008</a>.
https://bugs.webkit.org/show_bug.cgi?id=233184

Caused a crash in grid

Reverted changesets:

"Images as grid items should use the overridingLogicalWidth
when defined to compute the logical Height"
https://bugs.webkit.org/show_bug.cgi?id=228022
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/280078">r280078</a>

"[css-grid] svg image as grid items should use the overriding
logical width/height when defined to compute the logical
height/width"
https://bugs.webkit.org/show_bug.cgi?id=228105
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/280290">r280290</a>

"REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/280078">r280078</a>): broke fast/images/exif-orientation-
composited.html on windows"
https://bugs.webkit.org/show_bug.cgi?id=228325
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/282008">r282008</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange029expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange030expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange031expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange035expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange036expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/ChangeLog 2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2021-11-16  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r280078, r280290 and r282008.
+        https://bugs.webkit.org/show_bug.cgi?id=233184
+
+        Caused a crash in grid
+
+        Reverted changesets:
+
+        "Images as grid items should use the overridingLogicalWidth
+        when defined to compute the logical Height"
+        https://bugs.webkit.org/show_bug.cgi?id=228022
+        https://commits.webkit.org/r280078
+
+        "[css-grid] svg image as grid items should use the overriding
+        logical width/height when defined to compute the logical
+        height/width"
+        https://bugs.webkit.org/show_bug.cgi?id=228105
+        https://commits.webkit.org/r280290
+
+        "REGRESSION(r280078): broke fast/images/exif-orientation-
+        composited.html on windows"
+        https://bugs.webkit.org/show_bug.cgi?id=228325
+        https://commits.webkit.org/r282008
+
</ins><span class="cx"> 2021-11-16  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GLIB] Update test expectations and baselines. Unreviewed test gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/TestExpectations  2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1388,6 +1388,9 @@
</span><span class="cx"> imported/w3c/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-015.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/216146 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-align-001.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/216146 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-justify-001.html [ ImageOnlyFailure ]
</span><ins>+imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-007.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-008.html [ ImageOnlyFailure ]
</ins><span class="cx"> 
</span><span class="cx"> imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html [ ImageOnlyFailure ]
</span><span class="cx"> imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html [ ImageOnlyFailure ]
</span><span class="lines">@@ -4316,6 +4319,10 @@
</span><span class="cx"> webkit.org/b/209460 imported/w3c/web-platform-tests/css/css-grid/abspos/descendant-static-position-002.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/209460 imported/w3c/web-platform-tests/css/css-grid/abspos/descendant-static-position-003.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/212201 imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-limits-001.html [ Skip ]
</span><ins>+webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html [ ImageOnlyFailure ]
+webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html [ ImageOnlyFailure ]
+webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3.html [ ImageOnlyFailure ]
+webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4.html [ ImageOnlyFailure ]
</ins><span class="cx"> webkit.org/b/212246 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/231021 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-inline-baseline.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/212246 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-001.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2021-11-16  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r280078, r280290 and r282008.
+        https://bugs.webkit.org/show_bug.cgi?id=233184
+
+        Caused a crash in grid
+
+        Reverted changesets:
+
+        "Images as grid items should use the overridingLogicalWidth
+        when defined to compute the logical Height"
+        https://bugs.webkit.org/show_bug.cgi?id=228022
+        https://commits.webkit.org/r280078
+
+        "[css-grid] svg image as grid items should use the overriding
+        logical width/height when defined to compute the logical
+        height/width"
+        https://bugs.webkit.org/show_bug.cgi?id=228105
+        https://commits.webkit.org/r280290
+
+        "REGRESSION(r280078): broke fast/images/exif-orientation-
+        composited.html on windows"
+        https://bugs.webkit.org/show_bug.cgi?id=228325
+        https://commits.webkit.org/r282008
+
</ins><span class="cx"> 2021-11-15  Tim Nguyen  <ntim@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Re-import css/css-text-decor WPT
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange029expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt     2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt        2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS .before 1
</del><ins>+FAIL .before 1 assert_equals:
+<img id="item" src="support/100x100-green.png" class=" before" data-expected-width="200" data-expected-height="200">
+height expected 200 but got 100
</ins><span class="cx"> PASS .after 2
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange030expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt     2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt        2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> PASS .before 1
</span><del>-PASS .after 2
</del><ins>+FAIL .after 2 assert_equals:
+<img id="item" src="support/100x100-green.png" class=" before after" data-expected-width="200" data-expected-height="200">
+height expected 200 but got 100
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange031expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt     2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt        2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS .before 1
</del><ins>+FAIL .before 1 assert_equals:
+<img id="item" src="support/100x100-green.png" class=" before" data-expected-width="200" data-expected-height="200">
+height expected 200 but got 100
</ins><span class="cx"> PASS .after 2
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange035expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt     2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt        2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> PASS .before 1
</span><del>-PASS .after 2
</del><ins>+FAIL .after 2 assert_equals:
+<img id="item" src="support/100x100-green.png" class=" before after" data-expected-width="80" data-expected-height="80">
+height expected 80 but got 100
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssgridalignmentgridalignmentimpliessizechange036expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt     2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt        2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS .before 1
</del><ins>+FAIL .before 1 assert_equals:
+<img id="item" src="support/100x100-green.png" class=" before" data-expected-width="80" data-expected-height="80">
+height expected 80 but got 100
</ins><span class="cx"> PASS .after 2
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations  2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/platform/win/TestExpectations     2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -3821,6 +3821,8 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/177216 fast/images/animated-image-mp4.html [ Skip ]
</span><span class="cx"> 
</span><ins>+webkit.org/b/228325 fast/images/exif-orientation-composited.html [ Pass ImageOnlyFailure ]
+
</ins><span class="cx"> webkit.org/b/177234 http/wpt/resource-timing/rt-cors.html [ Skip ]
</span><span class="cx"> webkit.org/b/177234 http/wpt/resource-timing/rt-cors.worker.html [ Skip ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/Source/WebCore/ChangeLog      2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2021-11-16  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r280078, r280290 and r282008.
+        https://bugs.webkit.org/show_bug.cgi?id=233184
+
+        Caused a crash in grid
+
+        Reverted changesets:
+
+        "Images as grid items should use the overridingLogicalWidth
+        when defined to compute the logical Height"
+        https://bugs.webkit.org/show_bug.cgi?id=228022
+        https://commits.webkit.org/r280078
+
+        "[css-grid] svg image as grid items should use the overriding
+        logical width/height when defined to compute the logical
+        height/width"
+        https://bugs.webkit.org/show_bug.cgi?id=228105
+        https://commits.webkit.org/r280290
+
+        "REGRESSION(r280078): broke fast/images/exif-orientation-
+        composited.html on windows"
+        https://bugs.webkit.org/show_bug.cgi?id=228325
+        https://commits.webkit.org/r282008
+
</ins><span class="cx"> 2021-11-16  Cathie Chen  <cathiechen@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [CSS contain] The size should be updated if layout containment is inside a fit-content parent
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp    2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp       2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -1179,15 +1179,12 @@
</span><span class="cx"> void RenderGrid::applyStretchAlignmentToChildIfNeeded(RenderBox& child)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(child.overridingContainingBlockContentLogicalHeight());
</span><del>-    ASSERT(child.overridingContainingBlockContentLogicalWidth());
</del><span class="cx"> 
</span><del>-    // We clear height and width override values because we will decide now whether it's allowed or
</del><ins>+    // We clear height override values because we will decide now whether it's allowed or
</ins><span class="cx">     // not, evaluating the conditions which might have changed since the old values were set.
</span><span class="cx">     child.clearOverridingLogicalHeight();
</span><del>-    child.clearOverridingLogicalWidth();
</del><span class="cx"> 
</span><span class="cx">     GridTrackSizingDirection childBlockDirection = GridLayoutFunctions::flowAwareDirectionForChild(*this, child, ForRows);
</span><del>-    GridTrackSizingDirection childInlineDirection = GridLayoutFunctions::flowAwareDirectionForChild(*this, child, ForColumns);
</del><span class="cx">     bool blockFlowIsColumnAxis = childBlockDirection == ForRows;
</span><span class="cx">     bool allowedToStretchChildBlockSize = blockFlowIsColumnAxis ? allowedToStretchChildAlongColumnAxis(child) : allowedToStretchChildAlongRowAxis(child);
</span><span class="cx">     if (allowedToStretchChildBlockSize && !aspectRatioPrefersInline(child, blockFlowIsColumnAxis)) {
</span><span class="lines">@@ -1203,13 +1200,7 @@
</span><span class="cx">             child.setLogicalHeight(0_lu);
</span><span class="cx">             child.setNeedsLayout(MarkOnlyThis);
</span><span class="cx">         }
</span><del>-    } else if (!allowedToStretchChildBlockSize && allowedToStretchChildAlongRowAxis(child)) {
-        LayoutUnit stretchedLogicalWidth = availableAlignmentSpaceForChildBeforeStretching(GridLayoutFunctions::overridingContainingBlockContentSizeForChild(child, childInlineDirection).value(), child);
-        LayoutUnit desiredLogicalWidth = constrainLogicalWidthInFragmentByMinMax(stretchedLogicalWidth, contentWidth(), *this, nullptr);
-        child.setOverridingLogicalWidth(desiredLogicalWidth);
-        if (desiredLogicalWidth != child.logicalWidth())
-            child.setNeedsLayout(MarkOnlyThis);
-    } 
</del><ins>+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // FIXME: This logic is shared by RenderFlexibleBox, so it should be moved to RenderBox.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (285856 => 285857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp        2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp   2021-11-16 11:41:05 UTC (rev 285857)
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx">         // For flex or grid items where the logical height has been overriden then we should use that size to compute the replaced width as long as the flex or
</span><span class="cx">         // grid item has an intrinsic size. It is possible (indeed, common) for an SVG graphic to have an intrinsic aspect ratio but not to have an intrinsic
</span><span class="cx">         // width or height. There are also elements with intrinsic sizes but without intrinsic ratio (like an iframe).
</span><del>-        if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalHeight() && ((hasIntrinsicWidth && hasIntrinsicHeight) || (contentRenderer && contentRenderer->isSVGRoot() && (hasIntrinsicWidth || hasIntrinsicHeight))))
</del><ins>+        if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalHeight() && hasIntrinsicWidth && hasIntrinsicHeight)
</ins><span class="cx">             return computeReplacedLogicalWidthRespectingMinMaxWidth(roundToInt(round(overridingContentLogicalHeight() * intrinsicRatio)), shouldComputePreferred);
</span><span class="cx"> 
</span><span class="cx">         // If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic width, then that intrinsic width is the used value of 'width'.
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx">     bool hasIntrinsicWidth = constrainedSize.hasIntrinsicWidth || constrainedSize.width() > 0;
</span><span class="cx"> 
</span><span class="cx">     // See computeReplacedLogicalHeight() for a similar check for heights.
</span><del>-    if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalWidth() && ((hasIntrinsicWidth && hasIntrinsicHeight) || (contentRenderer && contentRenderer->isSVGRoot() && (hasIntrinsicWidth || hasIntrinsicHeight))))
</del><ins>+    if (intrinsicRatio && isFlexItem() && hasOverridingLogicalWidth() && hasIntrinsicHeight && hasIntrinsicWidth)
</ins><span class="cx">         return computeReplacedLogicalHeightRespectingMinMaxHeight(roundToInt(round(overridingContentLogicalWidth() / intrinsicRatio)));
</span><span class="cx"> 
</span><span class="cx">     // If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic height, then that intrinsic height is the used value of 'height'.
</span></span></pre>
</div>
</div>

</body>
</html>