<!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>[270143] 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/270143">270143</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2020-11-21 04:56:46 -0800 (Sat, 21 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][Integration] Add contentLogicalOffset and contentLogicalWidth to InlineLineGeometry(Line)
https://bugs.webkit.org/show_bug.cgi?id=219220

Reviewed by Antti Koivisto.

This helps to match the legacy root inline box's geometry where
line left + content offset == root inline box left edge
line left + content offset + content width = root inline box right edge

* layout/inlineformatting/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):
* layout/inlineformatting/InlineLineGeometry.h:
(WebCore::Layout::InlineLineGeometry::contentOffset const):
(WebCore::Layout::InlineLineGeometry::contentWidth const):
(WebCore::Layout::InlineLineGeometry::InlineLineGeometry):
(WebCore::Layout::InlineLineGeometry::horizontalAlignmentOffset const): Deleted.
* layout/integration/LayoutIntegrationInlineContentBuilder.cpp:
(WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
* layout/integration/LayoutIntegrationLine.h:
(WebCore::LayoutIntegration::Line::Line):
(WebCore::LayoutIntegration::Line::contentOffset const):
(WebCore::LayoutIntegration::Line::contentWidth const):
(WebCore::LayoutIntegration::Line::horizontalAlignmentOffset const): Deleted.
* layout/integration/LayoutIntegrationLineIteratorModernPath.h:
(WebCore::LayoutIntegration::LineIteratorModernPath::contentLogicalLeft const):
(WebCore::LayoutIntegration::LineIteratorModernPath::contentLogicalRight const):
* layout/integration/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::paint):
* layout/integration/LayoutIntegrationPagination.cpp:
(WebCore::LayoutIntegration::makeAdjustedContent):
* layout/integration/LayoutIntegrationRunIteratorModernPath.h:
(WebCore::LayoutIntegration::RunIteratorModernPath::createTextRun const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingContextGeometrycpp">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineLineBuilderh">trunk/Source/WebCore/layout/inlineformatting/InlineLineBuilder.h</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineLineGeometryh">trunk/Source/WebCore/layout/inlineformatting/InlineLineGeometry.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContentBuildercpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineh">trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineIteratorModernPathh">trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationPaginationcpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationRunIteratorModernPathh">trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorModernPath.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/ChangeLog      2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2020-11-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Add contentLogicalOffset and contentLogicalWidth to InlineLineGeometry(Line)
+        https://bugs.webkit.org/show_bug.cgi?id=219220
+
+        Reviewed by Antti Koivisto.
+
+        This helps to match the legacy root inline box's geometry where
+        line left + content offset == root inline box left edge
+        line left + content offset + content width = root inline box right edge
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):
+        * layout/inlineformatting/InlineLineGeometry.h:
+        (WebCore::Layout::InlineLineGeometry::contentOffset const):
+        (WebCore::Layout::InlineLineGeometry::contentWidth const):
+        (WebCore::Layout::InlineLineGeometry::InlineLineGeometry):
+        (WebCore::Layout::InlineLineGeometry::horizontalAlignmentOffset const): Deleted.
+        * layout/integration/LayoutIntegrationInlineContentBuilder.cpp:
+        (WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
+        * layout/integration/LayoutIntegrationLine.h:
+        (WebCore::LayoutIntegration::Line::Line):
+        (WebCore::LayoutIntegration::Line::contentOffset const):
+        (WebCore::LayoutIntegration::Line::contentWidth const):
+        (WebCore::LayoutIntegration::Line::horizontalAlignmentOffset const): Deleted.
+        * layout/integration/LayoutIntegrationLineIteratorModernPath.h:
+        (WebCore::LayoutIntegration::LineIteratorModernPath::contentLogicalLeft const):
+        (WebCore::LayoutIntegration::LineIteratorModernPath::contentLogicalRight const):
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::paint):
+        * layout/integration/LayoutIntegrationPagination.cpp:
+        (WebCore::LayoutIntegration::makeAdjustedContent):
+        * layout/integration/LayoutIntegrationRunIteratorModernPath.h:
+        (WebCore::LayoutIntegration::RunIteratorModernPath::createTextRun const):
+
</ins><span class="cx"> 2020-11-21  Jiewen Tan  <jiewen_tan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [WebAuthn] Implement SPI for AuthenticationServices.Framework
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp    2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx">     updateBoxGeometry();
</span><span class="cx"> 
</span><span class="cx">     auto constructLineGeometry = [&] {
</span><del>-        formattingState.addLine({ lineLogicalRect, lineBox.logicalSize(), lineBox.alignmentBaseline(), lineBox.horizontalAlignmentOffset().valueOr(InlineLayoutUnit { }) });
</del><ins>+        formattingState.addLine({ lineLogicalRect, lineBox.logicalSize(), lineBox.alignmentBaseline(), lineBox.horizontalAlignmentOffset().valueOr(InlineLayoutUnit { }), lineContent.contentLogicalWidth });
</ins><span class="cx">     };
</span><span class="cx">     constructLineGeometry();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingContextGeometrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp 2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp    2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> {
</span><span class="cx">     auto& runs = lineContent.runs;
</span><span class="cx">     auto lineLogicalWidth = lineContent.lineLogicalWidth;
</span><del>-    auto contentLogicalWidth = lineContent.lineContentLogicalWidth;
</del><ins>+    auto contentLogicalWidth = lineContent.contentLogicalWidth;
</ins><span class="cx">     auto isLineConsideredEmpty = lineContent.isLineConsideredEmpty ? LineBox::IsLineConsideredEmpty::Yes : LineBox::IsLineConsideredEmpty::No;
</span><span class="cx">     auto lineBox = LineBox { lineContent.logicalTopLeft, contentLogicalWidth, isLineConsideredEmpty };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineLineBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLineBuilder.h (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineLineBuilder.h 2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLineBuilder.h    2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">         bool hasIntrusiveFloat { false };
</span><span class="cx">         InlineLayoutPoint logicalTopLeft;
</span><span class="cx">         InlineLayoutUnit lineLogicalWidth;
</span><del>-        InlineLayoutUnit lineContentLogicalWidth;
</del><ins>+        InlineLayoutUnit contentLogicalWidth;
</ins><span class="cx">         bool isLineConsideredEmpty { true };
</span><span class="cx">         bool isLastLineWithInlineContent { true };
</span><span class="cx">         const Line::RunList& runs;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineLineGeometryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLineGeometry.h (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineLineGeometry.h        2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLineGeometry.h   2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> class InlineLineGeometry {
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>-    InlineLineGeometry(const InlineRect& lineLogicalRect, const InlineLayoutSize& lineBoxLogicalSize, InlineLayoutUnit aligmentBaseline, InlineLayoutUnit horizontalAlignmentOffset);
</del><ins>+    InlineLineGeometry(const InlineRect& lineLogicalRect, const InlineLayoutSize& lineBoxLogicalSize, InlineLayoutUnit aligmentBaseline, InlineLayoutUnit contentLogicalLeftOffset, InlineLayoutUnit contentLogicalWidth);
</ins><span class="cx"> 
</span><span class="cx">     InlineLayoutUnit logicalLeft() const { return logicalRect().left(); };
</span><span class="cx">     InlineLayoutUnit logicalRight() const { return logicalRect().right(); };
</span><span class="lines">@@ -50,8 +50,10 @@
</span><span class="cx">     const InlineLayoutSize& lineBoxLogicalSize() const { return m_lineBoxLogicalSize; }
</span><span class="cx"> 
</span><span class="cx">     InlineLayoutUnit baseline() const { return m_aligmentBaseline; }
</span><del>-    InlineLayoutUnit horizontalAlignmentOffset() const { return m_horizontalAlignmentOffset; }
</del><span class="cx"> 
</span><ins>+    InlineLayoutUnit contentLogicalLeftOffset() const { return m_contentLogicalLeftOffset; }
+    InlineLayoutUnit contentLogicalWidth() const { return m_contentLogicalWidth; }
+
</ins><span class="cx">     void moveVertically(InlineLayoutUnit offset) { m_logicalRect.moveVertically(offset); }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="lines">@@ -58,14 +60,16 @@
</span><span class="cx">     InlineRect m_logicalRect;
</span><span class="cx">     InlineLayoutSize m_lineBoxLogicalSize;
</span><span class="cx">     InlineLayoutUnit m_aligmentBaseline { 0 };
</span><del>-    InlineLayoutUnit m_horizontalAlignmentOffset { 0 };
</del><ins>+    InlineLayoutUnit m_contentLogicalLeftOffset { 0 };
+    InlineLayoutUnit m_contentLogicalWidth { 0 };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><del>-inline InlineLineGeometry::InlineLineGeometry(const InlineRect& lineLogicalRect, const InlineLayoutSize& lineBoxLogicalSize, InlineLayoutUnit aligmentBaseline, InlineLayoutUnit horizontalAlignmentOffset)
</del><ins>+inline InlineLineGeometry::InlineLineGeometry(const InlineRect& lineLogicalRect, const InlineLayoutSize& lineBoxLogicalSize, InlineLayoutUnit aligmentBaseline, InlineLayoutUnit contentLogicalLeftOffset, InlineLayoutUnit contentLogicalWidth)
</ins><span class="cx">     : m_logicalRect(lineLogicalRect)
</span><span class="cx">     , m_lineBoxLogicalSize(lineBoxLogicalSize)
</span><span class="cx">     , m_aligmentBaseline(aligmentBaseline)
</span><del>-    , m_horizontalAlignmentOffset(horizontalAlignmentOffset)
</del><ins>+    , m_contentLogicalLeftOffset(contentLogicalLeftOffset)
+    , m_contentLogicalWidth(contentLogicalWidth)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContentBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp        2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp   2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx">             enclosingTopAndBottom.top = roundToInt(enclosingTopAndBottom.top);
</span><span class="cx">             enclosingTopAndBottom.bottom = roundToInt(enclosingTopAndBottom.bottom);
</span><span class="cx">         }
</span><del>-        inlineContent.lines.append({ firstRunIndex, runCount, lineRect, lineBoxLogicalSize.width(), enclosingTopAndBottom, scrollableOverflowRect, lineInkOverflowRect, line.baseline(), line.horizontalAlignmentOffset() });
</del><ins>+        inlineContent.lines.append({ firstRunIndex, runCount, lineRect, lineBoxLogicalSize.width(), enclosingTopAndBottom, scrollableOverflowRect, lineInkOverflowRect, line.baseline(), line.contentLogicalLeftOffset(), line.contentLogicalWidth() });
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h  2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h     2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">         float top { 0 };
</span><span class="cx">         float bottom { 0 };
</span><span class="cx">     };
</span><del>-    Line(size_t firstRunIndex, size_t runCount, const FloatRect& lineRect, float lineBoxWidth, EnclosingTopAndBottom enclosingTopAndBottom, const FloatRect& scrollableOverflow, const FloatRect& inkOverflow, float baseline, float horizontalAlignmentOffset)
</del><ins>+    Line(size_t firstRunIndex, size_t runCount, const FloatRect& lineRect, float lineBoxWidth, EnclosingTopAndBottom enclosingTopAndBottom, const FloatRect& scrollableOverflow, const FloatRect& inkOverflow, float baseline, float contentLeftOffset, float contentWidth)
</ins><span class="cx">         : m_firstRunIndex(firstRunIndex)
</span><span class="cx">         , m_runCount(runCount)
</span><span class="cx">         , m_lineRect(lineRect)
</span><span class="lines">@@ -49,7 +49,8 @@
</span><span class="cx">         , m_scrollableOverflow(scrollableOverflow)
</span><span class="cx">         , m_inkOverflow(inkOverflow)
</span><span class="cx">         , m_baseline(baseline)
</span><del>-        , m_horizontalAlignmentOffset(horizontalAlignmentOffset)
</del><ins>+        , m_contentLeftOffset(contentLeftOffset)
+        , m_contentWidth(contentWidth)
</ins><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -62,7 +63,8 @@
</span><span class="cx">     const FloatRect& scrollableOverflow() const { return m_scrollableOverflow; }
</span><span class="cx">     const FloatRect& inkOverflow() const { return m_inkOverflow; }
</span><span class="cx">     float baseline() const { return m_baseline; }
</span><del>-    float horizontalAlignmentOffset() const { return m_horizontalAlignmentOffset; }
</del><ins>+    float contentLeftOffset() const { return m_contentLeftOffset; }
+    float contentWidth() const { return m_contentWidth; }
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     size_t m_firstRunIndex { 0 };
</span><span class="lines">@@ -77,7 +79,8 @@
</span><span class="cx">     FloatRect m_scrollableOverflow;
</span><span class="cx">     FloatRect m_inkOverflow;
</span><span class="cx">     float m_baseline { 0 };
</span><del>-    float m_horizontalAlignmentOffset { 0 };
</del><ins>+    float m_contentLeftOffset { 0 };
+    float m_contentWidth { 0 };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineIteratorModernPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h        2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h   2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx">     LayoutUnit selectionTopForHitTesting() const { return top(); }
</span><span class="cx">     LayoutUnit selectionBottom() const { return bottom(); }
</span><span class="cx"> 
</span><del>-    float contentLogicalLeft() const { return line().rect().x() + line().horizontalAlignmentOffset(); }
-    float contentLogicalRight() const { return contentLogicalLeft() + line().rect().width(); }
</del><ins>+    float contentLogicalLeft() const { return line().rect().x() + line().contentLeftOffset(); }
+    float contentLogicalRight() const { return contentLogicalLeft() + line().contentWidth(); }
</ins><span class="cx">     float y() const { return lineBoxTop(); }
</span><span class="cx">     float logicalHeight() const { return line().rect().height(); }
</span><span class="cx">     bool isHorizontal() const { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp  2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp     2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx">         auto expansion = run.expansion();
</span><span class="cx">         // TextRun expects the xPos to be adjusted with the aligment offset (e.g. when the line is center aligned
</span><span class="cx">         // and the run starts at 100px, due to the horizontal aligment, the xpos is supposed to be at 0px).
</span><del>-        auto xPos = rect.x() - (line.rect().x() + line.horizontalAlignmentOffset());
</del><ins>+        auto xPos = rect.x() - (line.rect().x() + line.contentLeftOffset());
</ins><span class="cx">         WebCore::TextRun textRun { textContent.renderedContent(), xPos, expansion.horizontalExpansion, expansion.behavior };
</span><span class="cx">         textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
</span><span class="cx">         FloatPoint textOrigin { rect.x() + paintOffset.x(), roundToDevicePixel(baseline, deviceScaleFactor) };
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationPaginationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp  2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp     2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -135,7 +135,8 @@
</span><span class="cx">             moveVertically(line.scrollableOverflow(), offset),
</span><span class="cx">             moveVertically(line.inkOverflow(), offset),
</span><span class="cx">             line.baseline(),
</span><del>-            line.horizontalAlignmentOffset()
</del><ins>+            line.contentLeftOffset(),
+            line.contentWidth()
</ins><span class="cx">         };
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationRunIteratorModernPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorModernPath.h (270142 => 270143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorModernPath.h 2020-11-21 08:11:34 UTC (rev 270142)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorModernPath.h    2020-11-21 12:56:46 UTC (rev 270143)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx">         auto& style = run().style();
</span><span class="cx">         auto expansion = run().expansion();
</span><span class="cx">         auto rect = this->rect();
</span><del>-        auto xPos = rect.x() - (line().rect().x() + line().horizontalAlignmentOffset());
</del><ins>+        auto xPos = rect.x() - (line().rect().x() + line().contentLeftOffset());
</ins><span class="cx"> 
</span><span class="cx">         auto textForRun = [&] {
</span><span class="cx">             if (hyphenMode == HyphenMode::Ignore || !hasHyphen())
</span></span></pre>
</div>
</div>

</body>
</html>