<!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>[287495] 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/287495">287495</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-12-31 12:08:22 -0800 (Fri, 31 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/287028">r287028</a>): Incorrect root inline box horizontal position when text-align offset is present
https://bugs.webkit.org/show_bug.cgi?id=234767

Reviewed by Antti Koivisto.

Source/WebCore:

Display line has the content's visual left (rtl vs ltr) which should be used to position the root inline box.
We use the same offset when construcing the non-root display boxes.

Test: fast/text/root-inline-box-offset-with-text-align.html

* layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::build):

LayoutTests:

* fast/text/root-inline-box-offset-with-text-align-expected.html: Added.
* fast/text/root-inline-box-offset-with-text-align.html: Added.</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="#trunkSourceWebCorelayoutformattingContextsinlinedisplayInlineDisplayContentBuildercpp">trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextrootinlineboxoffsetwithtextalignexpectedhtml">trunk/LayoutTests/fast/text/root-inline-box-offset-with-text-align-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextrootinlineboxoffsetwithtextalignhtml">trunk/LayoutTests/fast/text/root-inline-box-offset-with-text-align.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (287494 => 287495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-12-31 19:46:47 UTC (rev 287494)
+++ trunk/LayoutTests/ChangeLog 2021-12-31 20:08:22 UTC (rev 287495)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-12-31  Alan Bujtas  <zalan@apple.com>
+
+        REGRESSION (r287028): Incorrect root inline box horizontal position when text-align offset is present
+        https://bugs.webkit.org/show_bug.cgi?id=234767
+
+        Reviewed by Antti Koivisto.
+
+        * fast/text/root-inline-box-offset-with-text-align-expected.html: Added.
+        * fast/text/root-inline-box-offset-with-text-align.html: Added.
+
</ins><span class="cx"> 2021-12-31  Diego Pino Garcia  <dpino@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][WPE] Unreviewed test gardening, move several fast/scrolling tests failures to GLIB
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextrootinlineboxoffsetwithtextalignexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/root-inline-box-offset-with-text-align-expected.html (0 => 287495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/root-inline-box-offset-with-text-align-expected.html                         (rev 0)
+++ trunk/LayoutTests/fast/text/root-inline-box-offset-with-text-align-expected.html    2021-12-31 20:08:22 UTC (rev 287495)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<style>
+div { 
+  width: 20px;
+  height: 20px;
+  background: green;
+  position: relative;
+}
+</style>
+<div></div>
+<div style="left: 20px;"></div>
+<div style="left: 40px;"></div>
+
+<div></div>
+<div style="left: 20px;"></div>
+<div style="left: 40px;"></div>
+
+<div></div>
+<div style="left: 20px;"></div>
+<div style="left: 40px;"></div>
+
+<div></div>
+<div style="left: 20px;"></div>
+<div style="left: 40px;"></div>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextrootinlineboxoffsetwithtextalignhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/root-inline-box-offset-with-text-align.html (0 => 287495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/root-inline-box-offset-with-text-align.html                          (rev 0)
+++ trunk/LayoutTests/fast/text/root-inline-box-offset-with-text-align.html     2021-12-31 20:08:22 UTC (rev 287495)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<style>
+div { 
+  width: 60px;
+  font-family: Ahem;
+  font-size: 20px;
+  color: green;
+}
+div:first-line { background: green; }
+</style>
+<div>
+  <div style="text-align: left">x</div>
+  <div style="text-align: center">x</div>
+  <div style="text-align: right">x</div>
+  <div style="text-align: start">x</div>
+  <div style="text-align: center">x</div>
+  <div style="text-align: end">x</div>
+</div>
+
+<div style="direction: rtl">
+  <div style="text-align: left">x</div>
+  <div style="text-align: center">x</div>
+  <div style="text-align: right">x</div>
+  <div style="text-align: end">x</div>
+  <div style="text-align: center">x</div>
+  <div style="text-align: start">x</div>
+</div>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287494 => 287495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-31 19:46:47 UTC (rev 287494)
+++ trunk/Source/WebCore/ChangeLog      2021-12-31 20:08:22 UTC (rev 287495)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-12-31  Alan Bujtas  <zalan@apple.com>
+
+        REGRESSION (r287028): Incorrect root inline box horizontal position when text-align offset is present
+        https://bugs.webkit.org/show_bug.cgi?id=234767
+
+        Reviewed by Antti Koivisto.
+
+        Display line has the content's visual left (rtl vs ltr) which should be used to position the root inline box.
+        We use the same offset when construcing the non-root display boxes.
+
+        Test: fast/text/root-inline-box-offset-with-text-align.html
+
+        * layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::InlineDisplayContentBuilder::build):
+
</ins><span class="cx"> 2021-12-31  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Updating the file name of attachment-backed images should automatically set the `alt` attribute
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlinedisplayInlineDisplayContentBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp (287494 => 287495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp    2021-12-31 19:46:47 UTC (rev 287494)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp       2021-12-31 20:08:22 UTC (rev 287495)
</span><span class="lines">@@ -95,7 +95,9 @@
</span><span class="cx">     m_lineIndex = lineIndex;
</span><span class="cx">     // Every line starts with a root box, even the empty ones.
</span><span class="cx">     auto rootInlineBoxRect = lineBox.logicalRectForRootInlineBox();
</span><del>-    rootInlineBoxRect.moveBy(displayLine.topLeft());
</del><ins>+    rootInlineBoxRect.moveHorizontally(displayLine.left() + displayLine.contentLeft());
+    rootInlineBoxRect.moveVertically(displayLine.top());
+
</ins><span class="cx">     boxes.append({ m_lineIndex, InlineDisplay::Box::Type::RootInlineBox, root(), UBIDI_DEFAULT_LTR, rootInlineBoxRect, rootInlineBoxRect, { }, { }, lineBox.rootInlineBox().hasContent() });
</span><span class="cx"> 
</span><span class="cx">     auto contentNeedsBidiReordering = !lineContent.visualOrderList.isEmpty();
</span></span></pre>
</div>
</div>

</body>
</html>