<!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>[278705] 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/278705">278705</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-06-10 09:41:07 -0700 (Thu, 10 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Treat intrinsic like *-content
https://bugs.webkit.org/show_bug.cgi?id=226790

Patch by Rob Buis <rbuis@igalia.com> on 2021-06-10
Reviewed by Sergio Villar Senin.

Source/WebCore:

Treat intrinsic like *-content for intrinsic logical
content calculations.

Tests: fast/flexbox/intrinsic-width-column-flow-crash.html
       fast/flexbox/intrinsic-width-crash.html
       fast/flexbox/min-intrinsic-width-crash.html

* platform/Length.h:
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeIntrinsicLogicalContentHeightUsing const):
(WebCore::RenderBox::computeContentAndScrollbarLogicalHeightUsing const):

LayoutTests:

Add tests for intrinsic and min-intrinsic and move relevant tests to fast/flexbox.

* fast/flexbox/intrinsic-width-column-flow-crash-expected.txt: Copied from LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt.
* fast/flexbox/intrinsic-width-column-flow-crash.html: Copied from LayoutTests/fast/css/flex-box-intrinsic-width-crash.html.
* fast/flexbox/intrinsic-width-crash-expected.txt: Copied from LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt.
* fast/flexbox/intrinsic-width-crash.html: Copied from LayoutTests/fast/css/flex-box-intrinsic-width-crash.html.
* fast/flexbox/min-intrinsic-width-crash-expected.txt: Renamed from LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt.
* fast/flexbox/min-intrinsic-width-crash.html: Renamed from LayoutTests/fast/css/flex-box-intrinsic-width-crash.html.</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="#trunkSourceWebCoreplatformLengthh">trunk/Source/WebCore/platform/Length.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastflexboxintrinsicwidthcolumnflowcrashexpectedtxt">trunk/LayoutTests/fast/flexbox/intrinsic-width-column-flow-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastflexboxintrinsicwidthcolumnflowcrashhtml">trunk/LayoutTests/fast/flexbox/intrinsic-width-column-flow-crash.html</a></li>
<li><a href="#trunkLayoutTestsfastflexboxintrinsicwidthcrashexpectedtxt">trunk/LayoutTests/fast/flexbox/intrinsic-width-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastflexboxintrinsicwidthcrashhtml">trunk/LayoutTests/fast/flexbox/intrinsic-width-crash.html</a></li>
<li><a href="#trunkLayoutTestsfastflexboxminintrinsicwidthcrashexpectedtxt">trunk/LayoutTests/fast/flexbox/min-intrinsic-width-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastflexboxminintrinsicwidthcrashhtml">trunk/LayoutTests/fast/flexbox/min-intrinsic-width-crash.html</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssflexboxintrinsicwidthcrashexpectedtxt">trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssflexboxintrinsicwidthcrashhtml">trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (278704 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-06-10 16:20:44 UTC (rev 278704)
+++ trunk/LayoutTests/ChangeLog 2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-06-10  Rob Buis  <rbuis@igalia.com>
+
+        Treat intrinsic like *-content
+        https://bugs.webkit.org/show_bug.cgi?id=226790
+
+        Reviewed by Sergio Villar Senin.
+
+        Add tests for intrinsic and min-intrinsic and move relevant tests to fast/flexbox.
+
+        * fast/flexbox/intrinsic-width-column-flow-crash-expected.txt: Copied from LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt.
+        * fast/flexbox/intrinsic-width-column-flow-crash.html: Copied from LayoutTests/fast/css/flex-box-intrinsic-width-crash.html.
+        * fast/flexbox/intrinsic-width-crash-expected.txt: Copied from LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt.
+        * fast/flexbox/intrinsic-width-crash.html: Copied from LayoutTests/fast/css/flex-box-intrinsic-width-crash.html.
+        * fast/flexbox/min-intrinsic-width-crash-expected.txt: Renamed from LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt.
+        * fast/flexbox/min-intrinsic-width-crash.html: Renamed from LayoutTests/fast/css/flex-box-intrinsic-width-crash.html.
+
</ins><span class="cx"> 2021-06-10  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Mark a navigation timing test as flaky
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssflexboxintrinsicwidthcrashexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt (278704 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt   2021-06-10 16:20:44 UTC (rev 278704)
+++ trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt      2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-Passes if it doesn't crash!
</del></span></pre></div>
<a id="trunkLayoutTestsfastcssflexboxintrinsicwidthcrashhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html (278704 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html   2021-06-10 16:20:44 UTC (rev 278704)
+++ trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html      2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<script>
-if (window.testRunner)
-    testRunner.dumpAsText();
-</script>
-<style>
-  html, body {
-    flex-flow: column;
-    width: intrinsic;
-    writing-mode: vertical-rl;
-    display: flex;
-  }
-</style>
-Passes if it doesn't crash!
</del></span></pre></div>
<a id="trunkLayoutTestsfastflexboxintrinsicwidthcolumnflowcrashexpectedtxtfromrev278704trunkLayoutTestsfastcssflexboxintrinsicwidthcrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/flexbox/intrinsic-width-column-flow-crash-expected.txt (from rev 278704, trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt) (0 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/intrinsic-width-column-flow-crash-expected.txt                            (rev 0)
+++ trunk/LayoutTests/fast/flexbox/intrinsic-width-column-flow-crash-expected.txt       2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Passes if it doesn't crash!
</ins></span></pre></div>
<a id="trunkLayoutTestsfastflexboxintrinsicwidthcolumnflowcrashhtmlfromrev278704trunkLayoutTestsfastcssflexboxintrinsicwidthcrashhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/flexbox/intrinsic-width-column-flow-crash.html (from rev 278704, trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html) (0 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/intrinsic-width-column-flow-crash.html                            (rev 0)
+++ trunk/LayoutTests/fast/flexbox/intrinsic-width-column-flow-crash.html       2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+</script>
+<style>
+  html, body {
+    flex-flow: column;
+    width: intrinsic;
+    writing-mode: vertical-rl;
+    display: flex;
+  }
+</style>
+Passes if it doesn't crash!
</ins></span></pre></div>
<a id="trunkLayoutTestsfastflexboxintrinsicwidthcrashexpectedtxtfromrev278704trunkLayoutTestsfastcssflexboxintrinsicwidthcrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/flexbox/intrinsic-width-crash-expected.txt (from rev 278704, trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt) (0 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/intrinsic-width-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/flexbox/intrinsic-width-crash-expected.txt   2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Passes if it doesn't crash!
</ins></span></pre></div>
<a id="trunkLayoutTestsfastflexboxintrinsicwidthcrashhtmlfromrev278704trunkLayoutTestsfastcssflexboxintrinsicwidthcrashhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/flexbox/intrinsic-width-crash.html (from rev 278704, trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html) (0 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/intrinsic-width-crash.html                                (rev 0)
+++ trunk/LayoutTests/fast/flexbox/intrinsic-width-crash.html   2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+</script>
+<style>
+  p, body {
+    display: flex;
+  }
+  p {
+    writing-mode: vertical-rl;
+    width: intrinsic;
+  }
+</style>
+<body>
+<p>Passes if it doesn't crash!</p>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastflexboxminintrinsicwidthcrashexpectedtxtfromrev278704trunkLayoutTestsfastcssflexboxintrinsicwidthcrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/flexbox/min-intrinsic-width-crash-expected.txt (from rev 278704, trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt) (0 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/min-intrinsic-width-crash-expected.txt                            (rev 0)
+++ trunk/LayoutTests/fast/flexbox/min-intrinsic-width-crash-expected.txt       2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Passes if it doesn't crash!
</ins></span></pre></div>
<a id="trunkLayoutTestsfastflexboxminintrinsicwidthcrashhtmlfromrev278704trunkLayoutTestsfastcssflexboxintrinsicwidthcrashhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/flexbox/min-intrinsic-width-crash.html (from rev 278704, trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html) (0 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/min-intrinsic-width-crash.html                            (rev 0)
+++ trunk/LayoutTests/fast/flexbox/min-intrinsic-width-crash.html       2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+</script>
+<style>
+  p, body {
+    display: flex;
+  }
+  p {
+    writing-mode: vertical-rl;
+    width: min-intrinsic;
+  }
+</style>
+<body>
+<p>Passes if it doesn't crash!</p>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278704 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-10 16:20:44 UTC (rev 278704)
+++ trunk/Source/WebCore/ChangeLog      2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-06-10  Rob Buis  <rbuis@igalia.com>
+
+        Treat intrinsic like *-content
+        https://bugs.webkit.org/show_bug.cgi?id=226790
+
+        Reviewed by Sergio Villar Senin.
+
+        Treat intrinsic like *-content for intrinsic logical
+        content calculations.
+
+        Tests: fast/flexbox/intrinsic-width-column-flow-crash.html
+               fast/flexbox/intrinsic-width-crash.html
+               fast/flexbox/min-intrinsic-width-crash.html
+
+        * platform/Length.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeIntrinsicLogicalContentHeightUsing const):
+        (WebCore::RenderBox::computeContentAndScrollbarLogicalHeightUsing const):
+
</ins><span class="cx"> 2021-06-10  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix some inefficient uses of SharedBuffer
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Length.h (278704 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Length.h   2021-06-10 16:20:44 UTC (rev 278704)
+++ trunk/Source/WebCore/platform/Length.h      2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -119,9 +119,9 @@
</span><span class="cx"> 
</span><span class="cx">     float nonNanCalculatedValue(float maxValue) const;
</span><span class="cx"> 
</span><del>-private:
</del><span class="cx">     bool isLegacyIntrinsic() const;
</span><span class="cx"> 
</span><ins>+private:
</ins><span class="cx">     bool isCalculatedEqual(const Length&) const;
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT void ref() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (278704 => 278705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp     2021-06-10 16:20:44 UTC (rev 278704)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp        2021-06-10 16:41:07 UTC (rev 278705)
</span><span class="lines">@@ -3121,7 +3121,7 @@
</span><span class="cx"> {
</span><span class="cx">     // FIXME: The CSS sizing spec is considering changing what min-content/max-content should resolve to.
</span><span class="cx">     // If that happens, this code will have to change.
</span><del>-    if (logicalHeightLength.isMinContent() || logicalHeightLength.isMaxContent() || logicalHeightLength.isFitContent() || logicalHeightLength.isMinIntrinsic()) {
</del><ins>+    if (logicalHeightLength.isMinContent() || logicalHeightLength.isMaxContent() || logicalHeightLength.isFitContent() || logicalHeightLength.isLegacyIntrinsic()) {
</ins><span class="cx">         if (intrinsicContentHeight && style().boxSizing() == BoxSizing::BorderBox)
</span><span class="cx">             return intrinsicContentHeight.value() + borderAndPaddingLogicalHeight();
</span><span class="cx">         return intrinsicContentHeight;
</span><span class="lines">@@ -3138,7 +3138,7 @@
</span><span class="cx">         return heightType == MinSize ? std::optional<LayoutUnit>(0) : std::nullopt;
</span><span class="cx">     // FIXME: The CSS sizing spec is considering changing what min-content/max-content should resolve to.
</span><span class="cx">     // If that happens, this code will have to change.
</span><del>-    if (height.isIntrinsic() || height.isMinIntrinsic())
</del><ins>+    if (height.isIntrinsic() || height.isLegacyIntrinsic())
</ins><span class="cx">         return computeIntrinsicLogicalContentHeightUsing(height, intrinsicContentHeight, borderAndPaddingLogicalHeight());
</span><span class="cx">     if (height.isFixed())
</span><span class="cx">         return LayoutUnit(height.value());
</span></span></pre>
</div>
</div>

</body>
</html>