<!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>[285716] 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/285716">285716</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-11-12 06:40:42 -0800 (Fri, 12 Nov 2021)</dd>
</dl>
<h3>Log Message</h3>
<pre>[LFC][IFC] Add inline box margin-start support for visual ordering (bidi)
https://bugs.webkit.org/show_bug.cgi?id=233022
Reviewed by Antti Koivisto.
Line run geometry is margin box based (only applicable for inline level boxes), while
the displayRect() returns border box based geometry (again, only relevant for inline level boxes).
When computing the border box based left position using the distanceFromLogicalPreviousRun (line run based)
we have to offset it with the margin value.
* layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::createBoxesAndUpdateGeometryForLineContent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineDisplayContentBuildercpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285715 => 285716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2021-11-12 14:25:04 UTC (rev 285715)
+++ trunk/Source/WebCore/ChangeLog 2021-11-12 14:40:42 UTC (rev 285716)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-11-12 Alan Bujtas <zalan@apple.com>
+
+ [LFC][IFC] Add inline box margin-start support for visual ordering (bidi)
+ https://bugs.webkit.org/show_bug.cgi?id=233022
+
+ Reviewed by Antti Koivisto.
+
+ Line run geometry is margin box based (only applicable for inline level boxes), while
+ the displayRect() returns border box based geometry (again, only relevant for inline level boxes).
+ When computing the border box based left position using the distanceFromLogicalPreviousRun (line run based)
+ we have to offset it with the margin value.
+
+ * layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
+ (WebCore::Layout::InlineDisplayContentBuilder::createBoxesAndUpdateGeometryForLineContent):
+
</ins><span class="cx"> 2021-11-12 Adrian Perez de Castro <aperez@igalia.com>
</span><span class="cx">
</span><span class="cx"> Non-unified build fixes, early November 2021 edition, bis x2
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineDisplayContentBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp (285715 => 285716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp 2021-11-12 14:25:04 UTC (rev 285715)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp 2021-11-12 14:40:42 UTC (rev 285716)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx">
</span><span class="cx"> auto displayBoxRect = [&] {
</span><span class="cx"> auto logicalRect = InlineRect { };
</span><ins>+ auto marginStart = std::optional<LayoutUnit> { };
</ins><span class="cx">
</span><span class="cx"> if (lineRun.isText() || lineRun.isSoftLineBreak())
</span><span class="cx"> logicalRect = lineBox.logicalRectForTextRun(lineRun);
</span><span class="lines">@@ -102,6 +103,7 @@
</span><span class="cx"> logicalRect = lineBox.logicalRectForLineBreakBox(layoutBox);
</span><span class="cx"> else {
</span><span class="cx"> auto& boxGeometry = formattingState.boxGeometry(layoutBox);
</span><ins>+ marginStart = boxGeometry.marginStart();
</ins><span class="cx"> if (lineRun.isBox())
</span><span class="cx"> logicalRect = lineBox.logicalBorderBoxForAtomicInlineLevelBox(layoutBox, boxGeometry);
</span><span class="cx"> else if (lineRun.isInlineBoxStart() || lineRun.isLineSpanningInlineBoxStart())
</span><span class="lines">@@ -119,13 +121,13 @@
</span><span class="cx"> // Certain css properties (e.g. word-spacing) may introduce a gap between runs.
</span><span class="cx"> auto distanceFromLogicalPreviousRun = logicalPreviousRun ? lineRun.logicalLeft() - logicalPreviousRun->logicalRight() : lineRun.logicalLeft();
</span><span class="cx"> auto visualOrderRect = logicalRect;
</span><del>- auto contentLeft = contentRightInVisualOrder + distanceFromLogicalPreviousRun;
</del><ins>+ auto contentLeft = contentRightInVisualOrder + distanceFromLogicalPreviousRun + marginStart.value_or(0);
</ins><span class="cx"> visualOrderRect.setLeft(contentLeft);
</span><span class="cx"> // The inline box right edge includes its content as well as the inline box end (padding-right etc).
</span><span class="cx"> // What we need here is the inline box start run's width.
</span><del>- contentRightInVisualOrder = lineRun.isInlineBoxStart() || lineRun.isLineSpanningInlineBoxStart()
- ? visualOrderRect.left() + lineRun.logicalWidth()
- : visualOrderRect.right();
</del><ins>+ // Note that content width does not refer to content _box_ here (it does include padding and border for inline level boxes).
+ auto contentWidth = lineRun.isInlineBoxStart() || lineRun.isLineSpanningInlineBoxStart() ? lineRun.logicalWidth() - *marginStart : logicalRect.width();
+ contentRightInVisualOrder = visualOrderRect.left() + contentWidth;
</ins><span class="cx"> return visualOrderRect;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>