<!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>[260905] 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/260905">260905</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2020-04-29 10:52:30 -0700 (Wed, 29 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Header is blank on https://nader.org
https://bugs.webkit.org/show_bug.cgi?id=205747
<rdar://problem/58305910>

Reviewed by Simon Fraser.

Source/WebCore:

Do not use stale containing block width value while computing preferred width.

Test: fast/text/text-indent-inside-float.html

* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):

LayoutTests:

* fast/text/text-indent-inside-float-expected.html: Added.
* fast/text/text-indent-inside-float.html: Added.
* platform/mac/editing/pasteboard/drop-text-without-selection-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscsstexttextindentpercentagevalueintrinsicsizeexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text/text-indent/percentage-value-intrinsic-size-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttexttextindentinsidefloatexpectedhtml">trunk/LayoutTests/fast/text/text-indent-inside-float-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextindentinsidefloathtml">trunk/LayoutTests/fast/text/text-indent-inside-float.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (260904 => 260905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2020-04-29 17:20:27 UTC (rev 260904)
+++ trunk/LayoutTests/ChangeLog 2020-04-29 17:52:30 UTC (rev 260905)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2020-04-29  Zalan Bujtas  <zalan@apple.com>
+
+        Header is blank on https://nader.org
+        https://bugs.webkit.org/show_bug.cgi?id=205747
+        <rdar://problem/58305910>
+
+        Reviewed by Simon Fraser.
+
+        * fast/text/text-indent-inside-float-expected.html: Added.
+        * fast/text/text-indent-inside-float.html: Added.
+        * platform/mac/editing/pasteboard/drop-text-without-selection-expected.txt:
+
</ins><span class="cx"> 2020-04-29  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         http/tests/media/media-stream/device-change-event-in-iframe.html is a flaky failure
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexttextindentinsidefloatexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-indent-inside-float-expected.html (0 => 260905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-indent-inside-float-expected.html                               (rev 0)
+++ trunk/LayoutTests/fast/text/text-indent-inside-float-expected.html  2020-04-29 17:52:30 UTC (rev 260905)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<title>This tests that text-indent works with shrink-to-fit width computation.</title>
+<style>
+div {
+    border: 1px solid green;
+    float: right;
+    margin: 10px;
+}
+</style>
+
+<div style="width: 126px; height: 28px;"></div>
+<div style="width: 176px; height: 14px;"></div>
+<script>
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexttextindentinsidefloathtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-indent-inside-float.html (0 => 260905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-indent-inside-float.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/text-indent-inside-float.html   2020-04-29 17:52:30 UTC (rev 260905)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<title>This tests that text-indent works with shrink-to-fit width computation.</title>
+<style>
+#percentage_indent, #fixed_indent {
+    border: 1px solid green;
+    color: white;
+    font-family: ahem;
+    font-size: 14px;
+    margin: 10px;
+}
+</style>
+
+<div id=percentage_indent><div style="text-indent: 10%">some text</div></div>
+<div id=fixed_indent><div style="text-indent: 50px;">some text</div></div>
+<script>
+document.body.offsetHeight;
+percentage_indent.style.float = "right";
+fixed_indent.style.float = "right";
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscsstexttextindentpercentagevalueintrinsicsizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text/text-indent/percentage-value-intrinsic-size-expected.txt (260904 => 260905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text/text-indent/percentage-value-intrinsic-size-expected.txt  2020-04-29 17:20:27 UTC (rev 260904)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text/text-indent/percentage-value-intrinsic-size-expected.txt     2020-04-29 17:52:30 UTC (rev 260905)
</span><span class="lines">@@ -1,12 +1,5 @@
</span><span class="cx"> Test passes if there is a filled green square.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-FAIL #container 1 assert_equals: 
-<div id="container" data-expected-width="50" style="position:relative; float:left; height:100px; background:green;">
-  <div id="foo" style="text-indent: 100%;">
-    <div data-offset-x="50" data-expected-width="50" style="display:inline-block; width:50px; height:100px; background:green;"></div>
-    <div style="width:50px;"></div>
-  </div>
-</div>
-width expected 50 but got 100
</del><ins>+PASS #container 1 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (260904 => 260905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-04-29 17:20:27 UTC (rev 260904)
+++ trunk/Source/WebCore/ChangeLog      2020-04-29 17:52:30 UTC (rev 260905)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2020-04-29  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        Header is blank on https://nader.org
+        https://bugs.webkit.org/show_bug.cgi?id=205747
+        <rdar://problem/58305910>
+
+        Reviewed by Simon Fraser.
+
+        Do not use stale containing block width value while computing preferred width.
+
+        Test: fast/text/text-indent-inside-float.html
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):
+
+2020-04-29  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC][TFC] Take row span into account when checking for missing cells
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=211184
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (260904 => 260905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp       2020-04-29 17:20:27 UTC (rev 260904)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp  2020-04-29 17:52:30 UTC (rev 260905)
</span><span class="lines">@@ -4218,9 +4218,6 @@
</span><span class="cx">     float inlineMin = 0;
</span><span class="cx"> 
</span><span class="cx">     const RenderStyle& styleToUse = style();
</span><del>-    RenderBlock* containingBlock = this->containingBlock();
-    LayoutUnit cw = containingBlock ? containingBlock->contentLogicalWidth() : 0_lu;
-
</del><span class="cx">     // If we are at the start of a line, we want to ignore all white-space.
</span><span class="cx">     // Also strip spaces if we previously had text that ended in a trailing space.
</span><span class="cx">     bool stripFrontSpaces = true;
</span><span class="lines">@@ -4240,7 +4237,14 @@
</span><span class="cx">     // Signals the text indent was more negative than the min preferred width
</span><span class="cx">     bool hasRemainingNegativeTextIndent = false;
</span><span class="cx"> 
</span><del>-    LayoutUnit textIndent = minimumValueForLength(styleToUse.textIndent(), cw);
</del><ins>+    auto textIndent = LayoutUnit { };
+    if (styleToUse.textIndent().isFixed())
+        textIndent = LayoutUnit { styleToUse.textIndent().value() };
+    else if (auto* containingBlock = this->containingBlock(); containingBlock && containingBlock->style().logicalWidth().isFixed()) {
+        // At this point of the shrink-to-fit computatation, we don't have a used value for the containing block width
+        // (that's exactly to what we try to contribute here) unless the computed value is fixed.
+        textIndent = minimumValueForLength(styleToUse.textIndent(), containingBlock->style().logicalWidth().value());
+    }
</ins><span class="cx">     RenderObject* prevFloat = 0;
</span><span class="cx">     bool isPrevChildInlineFlow = false;
</span><span class="cx">     bool shouldBreakLineAfterText = false;
</span></span></pre>
</div>
</div>

</body>
</html>