<!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>[283754] 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/283754">283754</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-10-07 16:25:05 -0700 (Thu, 07 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Do not check for firstLineStyle while constructing RenderText
https://bugs.webkit.org/show_bug.cgi?id=231370
<rdar://83973189>

Reviewed by Antti Koivisto.

Source/WebCore:

First line computation requires the renderer to be fully attached to the tree.
Let's check for "can use simplified text measuring for first line" at a later time, when we
construct the LFC tree instead.

Test: fast/inline/first-line-style-too-early-crash.html

* layout/formattingContexts/inline/InlineTextItem.cpp:
(WebCore::Layout::InlineTextItem::createAndAppendTextItems):
* layout/formattingContexts/inline/text/TextUtil.cpp:
(WebCore::Layout::TextUtil::canUseSimplifiedTextMeasuringForFirstLine):
* layout/formattingContexts/inline/text/TextUtil.h:
* layout/integration/LayoutIntegrationBoxTree.cpp:
(WebCore::LayoutIntegration::BoxTree::buildTree):
* rendering/RenderText.cpp:
(WebCore::RenderText::computeCanUseSimplifiedTextMeasuring const):

LayoutTests:

* TestExpectations: existing bug surfaced by this change.
* fast/inline/first-line-style-too-early-crash-expected.txt: Added.
* fast/inline/first-line-style-too-early-crash.html: Added.</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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineTextItemcpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineTextItem.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilcpp">trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilh">trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationBoxTreecpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastinlinefirstlinestyletooearlycrashexpectedtxt">trunk/LayoutTests/fast/inline/first-line-style-too-early-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastinlinefirstlinestyletooearlycrashhtml">trunk/LayoutTests/fast/inline/first-line-style-too-early-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (283753 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-10-07 23:12:14 UTC (rev 283753)
+++ trunk/LayoutTests/ChangeLog 2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-10-07  Alan Bujtas  <zalan@apple.com>
+
+        Do not check for firstLineStyle while constructing RenderText
+        https://bugs.webkit.org/show_bug.cgi?id=231370
+        <rdar://83973189>
+
+        Reviewed by Antti Koivisto.
+
+        * TestExpectations: existing bug surfaced by this change.
+        * fast/inline/first-line-style-too-early-crash-expected.txt: Added.
+        * fast/inline/first-line-style-too-early-crash.html: Added.
+
</ins><span class="cx"> 2021-10-07  Ayumi Kojima  <ayumi_kojima@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [ iOS ] Marking expectations as slow for the tests that are flaky timing out.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (283753 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2021-10-07 23:12:14 UTC (rev 283753)
+++ trunk/LayoutTests/TestExpectations  2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -4667,6 +4667,7 @@
</span><span class="cx"> webkit.org/b/214461 imported/w3c/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/214461 imported/w3c/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/214461 imported/w3c/web-platform-tests/css/css-pseudo/spelling-error-001.html [ ImageOnlyFailure ]
</span><ins>+webkit.org/b/230964 imported/w3c/web-platform-tests/css/css-pseudo/first-line-and-placeholder.html [ ImageOnlyFailure ]
</ins><span class="cx"> 
</span><span class="cx"> webkit.org/b/214462 imported/w3c/web-platform-tests/css/css-scoping/host-context-specificity-001.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/214462 imported/w3c/web-platform-tests/css/css-scoping/host-context-specificity-002.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsfastinlinefirstlinestyletooearlycrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/first-line-style-too-early-crash-expected.txt (0 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/first-line-style-too-early-crash-expected.txt                              (rev 0)
+++ trunk/LayoutTests/fast/inline/first-line-style-too-early-crash-expected.txt 2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no crash or assert.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastinlinefirstlinestyletooearlycrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/first-line-style-too-early-crash.html (0 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/first-line-style-too-early-crash.html                              (rev 0)
+++ trunk/LayoutTests/fast/inline/first-line-style-too-early-crash.html 2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<style>
+  ::first-line {
+    width: 0;
+  }
+</style>
+<script>
+if (window.testRunner)
+  testRunner.dumpAsText();
+  onload = () => {
+    document.designMode = 'on';
+    document.execCommand('SelectAll');
+    document.execCommand('Bold');
+    document.execCommand('InsertOrderedList');
+  };
+</script>
+<div></div>PASS if no crash or assert.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (283753 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-07 23:12:14 UTC (rev 283753)
+++ trunk/Source/WebCore/ChangeLog      2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2021-10-07  Alan Bujtas  <zalan@apple.com>
+
+        Do not check for firstLineStyle while constructing RenderText
+        https://bugs.webkit.org/show_bug.cgi?id=231370
+        <rdar://83973189>
+
+        Reviewed by Antti Koivisto.
+
+        First line computation requires the renderer to be fully attached to the tree.
+        Let's check for "can use simplified text measuring for first line" at a later time, when we
+        construct the LFC tree instead.
+
+        Test: fast/inline/first-line-style-too-early-crash.html
+
+        * layout/formattingContexts/inline/InlineTextItem.cpp:
+        (WebCore::Layout::InlineTextItem::createAndAppendTextItems):
+        * layout/formattingContexts/inline/text/TextUtil.cpp:
+        (WebCore::Layout::TextUtil::canUseSimplifiedTextMeasuringForFirstLine):
+        * layout/formattingContexts/inline/text/TextUtil.h:
+        * layout/integration/LayoutIntegrationBoxTree.cpp:
+        (WebCore::LayoutIntegration::BoxTree::buildTree):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::computeCanUseSimplifiedTextMeasuring const):
+
</ins><span class="cx"> 2021-10-07  Myles C. Maxfield  <mmaxfield@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Stop parsing font palette things that we can't implement
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineTextItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineTextItem.cpp (283753 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineTextItem.cpp 2021-10-07 23:12:14 UTC (rev 283753)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineTextItem.cpp    2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -86,10 +86,9 @@
</span><span class="cx">     unsigned currentPosition = 0;
</span><span class="cx"> 
</span><span class="cx">     auto inlineItemWidth = [&](auto startPosition, auto length) -> std::optional<InlineLayoutUnit> {
</span><del>-        if (!inlineTextBox.canUseSimplifiedContentMeasuring())
</del><ins>+        if (!inlineTextBox.canUseSimplifiedContentMeasuring()
+            || !TextUtil::canUseSimplifiedTextMeasuringForFirstLine(inlineTextBox.style(), inlineTextBox.firstLineStyle()))
</ins><span class="cx">             return { };
</span><del>-        if (inlineTextBox.style() != inlineTextBox.firstLineStyle())
-            return { };
</del><span class="cx">         return TextUtil::width(inlineTextBox, fontCascade, startPosition, startPosition + length, { });
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp (283753 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp  2021-10-07 23:12:14 UTC (rev 283753)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp     2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -241,6 +241,11 @@
</span><span class="cx">     return LineBreakIteratorMode::Default;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool TextUtil::canUseSimplifiedTextMeasuringForFirstLine(const RenderStyle& style, const RenderStyle& firstLineStyle)
+{
+    return style.collapseWhiteSpace() == firstLineStyle.collapseWhiteSpace() && style.fontCascade() == firstLineStyle.fontCascade();
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> }
</span><ins>+}
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h (283753 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h    2021-10-07 23:12:14 UTC (rev 283753)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h       2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> 
</span><span class="cx">     static bool shouldPreserveSpacesAndTabs(const Box&);
</span><span class="cx">     static bool shouldPreserveNewline(const Box&);
</span><ins>+    static bool canUseSimplifiedTextMeasuringForFirstLine(const RenderStyle&, const RenderStyle& firstLineStyle);
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationBoxTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp (283753 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp     2021-10-07 23:12:14 UTC (rev 283753)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp        2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "RenderChildIterator.h"
</span><span class="cx"> #include "RenderImage.h"
</span><span class="cx"> #include "RenderLineBreak.h"
</span><ins>+#include "TextUtil.h"
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace LayoutIntegration {
</span><span class="lines">@@ -89,9 +90,14 @@
</span><span class="cx">         if (is<RenderText>(childRenderer)) {
</span><span class="cx">             auto& textRenderer = downcast<RenderText>(childRenderer);
</span><span class="cx">             auto style = RenderStyle::createAnonymousStyleWithDisplay(textRenderer.style(), DisplayType::Inline);
</span><ins>+            auto canUseSimplifiedTextMeasuring = [&] {
+                if (!textRenderer.canUseSimplifiedTextMeasuring())
+                    return false;
+                return !firstLineStyle || Layout::TextUtil::canUseSimplifiedTextMeasuringForFirstLine(style, *firstLineStyle);
+            }();
</ins><span class="cx">             return makeUnique<Layout::InlineTextBox>(
</span><span class="cx">                 style.textSecurity() == TextSecurity::None ? textRenderer.text() : RenderBlock::updateSecurityDiscCharacters(style, textRenderer.text())
</span><del>-                , textRenderer.canUseSimplifiedTextMeasuring(), WTFMove(style), WTFMove(firstLineStyle));
</del><ins>+                , canUseSimplifiedTextMeasuring, WTFMove(style), WTFMove(firstLineStyle));
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         auto style = RenderStyle::clone(childRenderer.style());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (283753 => 283754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp    2021-10-07 23:12:14 UTC (rev 283753)
+++ trunk/Source/WebCore/rendering/RenderText.cpp       2021-10-07 23:25:05 UTC (rev 283754)
</span><span class="lines">@@ -1431,12 +1431,6 @@
</span><span class="cx">     
</span><span class="cx">     // FIXME: All these checks should be more fine-grained at the inline item level.
</span><span class="cx">     auto& style = this->style();
</span><del>-    if (&style != &firstLineStyle()) {
-        auto& firstLineStyle = this->firstLineStyle();
-        if (style.fontCascade() != firstLineStyle.fontCascade() || style.collapseWhiteSpace() != firstLineStyle.collapseWhiteSpace())
-            return false;
-    }
-
</del><span class="cx">     auto& fontCascade = style.fontCascade();
</span><span class="cx">     if (fontCascade.wordSpacing() || fontCascade.letterSpacing())
</span><span class="cx">         return false;
</span></span></pre>
</div>
</div>

</body>
</html>