<!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>[287244] trunk/Source/WebCore</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/287244">287244</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-12-19 11:44:48 -0800 (Sun, 19 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] text-indent is treated as a margin applied to the start edge of the line box.
https://bugs.webkit.org/show_bug.cgi?id=234460

Reviewed by Antti Koivisto.

See https://drafts.csswg.org/css-text/#text-indent-property
This is also in preparation for adjusting the display line geometry when the inline axis direction is rtl.

* layout/formattingContexts/inline/InlineLineBuilder.cpp:
(WebCore::Layout::LineBuilder::layoutInlineContent):
(WebCore::Layout::LineBuilder::initialize):
(WebCore::Layout::LineBuilder::initialConstraintsForLine const):
* layout/formattingContexts/inline/InlineLineBuilder.h:
* layout/formattingContexts/inline/InlineRect.h:
(WebCore::Layout::InlineRect::moveLeftBy):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxBuildercpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineBuildercpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineBuilderh">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287243 => 287244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-19 18:52:49 UTC (rev 287243)
+++ trunk/Source/WebCore/ChangeLog      2021-12-19 19:44:48 UTC (rev 287244)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-12-19  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] text-indent is treated as a margin applied to the start edge of the line box.
+        https://bugs.webkit.org/show_bug.cgi?id=234460
+
+        Reviewed by Antti Koivisto.
+
+        See https://drafts.csswg.org/css-text/#text-indent-property
+        This is also in preparation for adjusting the display line geometry when the inline axis direction is rtl.
+
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::layoutInlineContent):
+        (WebCore::Layout::LineBuilder::initialize):
+        (WebCore::Layout::LineBuilder::initialConstraintsForLine const):
+        * layout/formattingContexts/inline/InlineLineBuilder.h:
+        * layout/formattingContexts/inline/InlineRect.h:
+        (WebCore::Layout::InlineRect::moveLeftBy):
+
</ins><span class="cx"> 2021-12-19  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Keyboard shortcut to scroll to top when already at the top of the page moves to the bottom
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp (287243 => 287244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp   2021-12-19 18:52:49 UTC (rev 287243)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp      2021-12-19 19:44:48 UTC (rev 287244)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx">     auto lineBoxLogicalHeight = constructAndAlignInlineLevelBoxes(lineBox, lineContent.runs, lineIndex);
</span><span class="cx"> 
</span><span class="cx">     auto line = [&] {
</span><del>-        auto lineBoxLogicalRect = InlineRect { lineContent.logicalTopLeft, lineContent.lineLogicalWidth, lineBoxLogicalHeight };
</del><ins>+        auto lineBoxLogicalRect = InlineRect { lineContent.lineLogicalTopLeft, lineContent.lineLogicalWidth, lineBoxLogicalHeight };
</ins><span class="cx">         auto scrollableOverflowRect = lineBoxLogicalRect;
</span><span class="cx">         auto& rootInlineBox = lineBox.rootInlineBox();
</span><span class="cx">         auto enclosingTopAndBottom = InlineDisplay::Line::EnclosingTopAndBottom { lineBoxLogicalRect.top() + rootInlineBox.logicalTop(), lineBoxLogicalRect.top() + rootInlineBox.logicalBottom() };
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp (287243 => 287244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp      2021-12-19 18:52:49 UTC (rev 287243)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp 2021-12-19 19:44:48 UTC (rev 287244)
</span><span class="lines">@@ -288,6 +288,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+struct UsedConstraints {
+    InlineRect logicalRect;
+    InlineLayoutUnit marginStart { 0 };
+    bool isConstrainedByFloat { false };
+};
</ins><span class="cx"> LineBuilder::LineContent LineBuilder::layoutInlineContent(const InlineItemRange& needsLayoutRange, size_t partialLeadingContentLength, std::optional<InlineLayoutUnit> overflowingLogicalWidth, const InlineRect& initialLineLogicalRect, bool isFirstLine)
</span><span class="cx"> {
</span><span class="cx">     initialize(initialConstraintsForLine(initialLineLogicalRect, isFirstLine), isFirstLine, needsLayoutRange.start, partialLeadingContentLength, overflowingLogicalWidth);
</span><span class="lines">@@ -332,6 +337,7 @@
</span><span class="cx">         , committedContent.overflowLogicalWidth
</span><span class="cx">         , m_floats
</span><span class="cx">         , m_contentIsConstrainedByFloat
</span><ins>+        , m_lineMarginStart
</ins><span class="cx">         , m_lineLogicalRect.topLeft()
</span><span class="cx">         , m_lineLogicalRect.width()
</span><span class="cx">         , m_line.contentLogicalWidth()
</span><span class="lines">@@ -351,7 +357,7 @@
</span><span class="cx"> 
</span><span class="cx">     auto committedContent = placeInlineContent(needsLayoutRange);
</span><span class="cx">     auto committedRange = close(needsLayoutRange, committedContent);
</span><del>-    auto lineWidth = lineConstraints.logicalRect.left() + m_line.contentLogicalWidth();
</del><ins>+    auto lineWidth = lineConstraints.logicalRect.left() + lineConstraints.marginStart + m_line.contentLogicalWidth();
</ins><span class="cx">     return { committedRange, lineWidth, m_floats };
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -395,7 +401,12 @@
</span><span class="cx">     createLineSpanningInlineBoxes();
</span><span class="cx">     m_line.initialize(m_lineSpanningInlineBoxes);
</span><span class="cx"> 
</span><ins>+    m_lineMarginStart = lineConstraints.marginStart;
</ins><span class="cx">     m_lineLogicalRect = lineConstraints.logicalRect;
</span><ins>+    m_lineLogicalRect.moveHorizontally(m_lineMarginStart);
+    // While negative margins normally don't expand the available space, preferred width computation gets confused by negative text-indent
+    // (shrink the space needed for the content) which we have to balance it here.
+    m_lineLogicalRect.expandHorizontally(-m_lineMarginStart);
</ins><span class="cx">     m_contentIsConstrainedByFloat = lineConstraints.isConstrainedByFloat;
</span><span class="cx"> 
</span><span class="cx">     if (partialLeadingContentLength) {
</span><span class="lines">@@ -547,7 +558,7 @@
</span><span class="cx">     return HorizontalConstraints { toLayoutUnit(lineLogicalLeft), toLayoutUnit(lineLogicalRight - lineLogicalLeft) };
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LineBuilder::UsedConstraints LineBuilder::initialConstraintsForLine(const InlineRect& initialLineLogicalRect, bool isFirstLine) const
</del><ins>+UsedConstraints LineBuilder::initialConstraintsForLine(const InlineRect& initialLineLogicalRect, bool isFirstLine) const
</ins><span class="cx"> {
</span><span class="cx">     auto lineLogicalLeft = initialLineLogicalRect.left();
</span><span class="cx">     auto lineLogicalRight = initialLineLogicalRect.right();
</span><span class="lines">@@ -598,8 +609,7 @@
</span><span class="cx">         }
</span><span class="cx">         return { minimumValueForLength(textIndent, initialLineLogicalRect.width()) };
</span><span class="cx">     };
</span><del>-    lineLogicalLeft += computedTextIndent();
-    return UsedConstraints { { initialLineLogicalRect.top(), lineLogicalLeft, lineLogicalRight - lineLogicalLeft, initialLineLogicalRect.height() }, lineIsConstrainedByFloat };
</del><ins>+    return UsedConstraints { { initialLineLogicalRect.top(), lineLogicalLeft, lineLogicalRight - lineLogicalLeft, initialLineLogicalRect.height() }, computedTextIndent(), lineIsConstrainedByFloat };
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void LineBuilder::candidateContentForLine(LineCandidate& lineCandidate, size_t currentInlineItemIndex, const InlineItemRange& layoutRange, InlineLayoutUnit currentLogicalRight)
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h (287243 => 287244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h        2021-12-19 18:52:49 UTC (rev 287243)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h   2021-12-19 19:44:48 UTC (rev 287244)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> 
</span><span class="cx"> class FloatingContext;
</span><span class="cx"> struct LineCandidate;
</span><ins>+struct UsedConstraints;
</ins><span class="cx"> 
</span><span class="cx"> class LineBuilder {
</span><span class="cx"> public:
</span><span class="lines">@@ -56,7 +57,8 @@
</span><span class="cx">         std::optional<InlineLayoutUnit> overflowLogicalWidth;
</span><span class="cx">         const FloatList& floats;
</span><span class="cx">         bool hasIntrusiveFloat { false };
</span><del>-        InlineLayoutPoint logicalTopLeft;
</del><ins>+        InlineLayoutUnit lineMarginStart { 0 };
+        InlineLayoutPoint lineLogicalTopLeft;
</ins><span class="cx">         InlineLayoutUnit lineLogicalWidth { 0 };
</span><span class="cx">         InlineLayoutUnit contentLogicalWidth { 0 };
</span><span class="cx">         InlineLayoutUnit hangingWhitespaceWidth { 0 };
</span><span class="lines">@@ -88,10 +90,6 @@
</span><span class="cx">         size_t partialTrailingContentLength { 0 };
</span><span class="cx">         std::optional<InlineLayoutUnit> overflowLogicalWidth { };
</span><span class="cx">     };
</span><del>-    struct UsedConstraints {
-        InlineRect logicalRect;
-        bool isConstrainedByFloat { false };
-    };
</del><span class="cx">     UsedConstraints initialConstraintsForLine(const InlineRect& initialLineLogicalRect, bool isFirstLine) const;
</span><span class="cx">     std::optional<HorizontalConstraints> floatConstraints(const InlineRect& lineLogicalRect) const;
</span><span class="cx"> 
</span><span class="lines">@@ -132,6 +130,7 @@
</span><span class="cx"> 
</span><span class="cx">     Line m_line;
</span><span class="cx">     InlineRect m_lineLogicalRect;
</span><ins>+    InlineLayoutUnit m_lineMarginStart { 0 };
</ins><span class="cx">     const InlineItems& m_inlineItems;
</span><span class="cx">     FloatList m_floats;
</span><span class="cx">     std::optional<InlineTextItem> m_partialLeadingTextItem;
</span></span></pre>
</div>
</div>

</body>
</html>