<!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>[285784] 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/285784">285784</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-11-13 15:28:17 -0800 (Sat, 13 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Inline box end's padding/border/margin should be taken into account when computing horizontal position for bidi content
https://bugs.webkit.org/show_bug.cgi?id=233083

Reviewed by Antti Koivisto.

Let's decouple the "display box rect" and the "content right in visual order" computation.
There are runs (e.g. inline box end) that don't need to call displayBoxRect() but they
still affect the "content right in visual order" (<span style="border-right: 10px solid green">).

* layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::createBoxesAndUpdateGeometryForLineContent): add the additional lineRun.isInlineBoxEnd() case.</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 (285783 => 285784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-13 23:21:41 UTC (rev 285783)
+++ trunk/Source/WebCore/ChangeLog      2021-11-13 23:28:17 UTC (rev 285784)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-11-13  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Inline box end's padding/border/margin should be taken into account when computing horizontal position for bidi content
+        https://bugs.webkit.org/show_bug.cgi?id=233083
+
+        Reviewed by Antti Koivisto.
+
+        Let's decouple the "display box rect" and the "content right in visual order" computation.
+        There are runs (e.g. inline box end) that don't need to call displayBoxRect() but they
+        still affect the "content right in visual order" (<span style="border-right: 10px solid green">).
+
+        * layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::InlineDisplayContentBuilder::createBoxesAndUpdateGeometryForLineContent): add the additional lineRun.isInlineBoxEnd() case.
+
</ins><span class="cx"> 2021-11-13  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][Integration] Add support for optional bidi character coverage checking
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineDisplayContentBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp (285783 => 285784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp    2021-11-13 23:21:41 UTC (rev 285783)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp       2021-11-13 23:28:17 UTC (rev 285784)
</span><span class="lines">@@ -103,11 +103,14 @@
</span><span class="cx">                 logicalRect = lineBox.logicalRectForLineBreakBox(layoutBox);
</span><span class="cx">             else {
</span><span class="cx">                 auto& boxGeometry = formattingState.boxGeometry(layoutBox);
</span><del>-                marginStart = boxGeometry.marginStart();
-                if (lineRun.isBox())
</del><ins>+                if (lineRun.isBox()) {
+                    marginStart = boxGeometry.marginStart();
</ins><span class="cx">                     logicalRect = lineBox.logicalBorderBoxForAtomicInlineLevelBox(layoutBox, boxGeometry);
</span><del>-                else if (lineRun.isInlineBoxStart() || lineRun.isLineSpanningInlineBoxStart())
</del><ins>+                } else if (lineRun.isInlineBoxStart()) {
+                    marginStart = boxGeometry.marginStart();
</ins><span class="cx">                     logicalRect = lineBox.logicalBorderBoxForInlineBox(layoutBox, boxGeometry);
</span><ins>+                } else if (lineRun.isLineSpanningInlineBoxStart())
+                    logicalRect = lineBox.logicalBorderBoxForInlineBox(layoutBox, boxGeometry);
</ins><span class="cx">                 else
</span><span class="cx">                     ASSERT_NOT_REACHED();
</span><span class="cx">             }
</span><span class="lines">@@ -123,16 +126,13 @@
</span><span class="cx">             auto visualOrderRect = logicalRect;
</span><span class="cx">             auto contentLeft = contentRightInVisualOrder + distanceFromLogicalPreviousRun + marginStart.value_or(0);
</span><span class="cx">             visualOrderRect.setLeft(contentLeft);
</span><del>-            // The inline box right edge includes its content as well as the inline box end (padding-right etc).
-            // What we need here is the inline box start run's width.
-            // 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;
</del><span class="cx">             return visualOrderRect;
</span><span class="cx">         };
</span><span class="cx"> 
</span><span class="cx">         if (lineRun.isText()) {
</span><span class="cx">             auto textRunRect = displayBoxRect();
</span><ins>+            contentRightInVisualOrder = textRunRect.right();
+
</ins><span class="cx">             auto inkOverflow = [&] {
</span><span class="cx">                 auto initialContaingBlockSize = RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextIntegrationEnabled()
</span><span class="cx">                     ? formattingState.layoutState().viewportSize()
</span><span class="lines">@@ -190,6 +190,7 @@
</span><span class="cx">         if (lineRun.isBox()) {
</span><span class="cx">             ASSERT(layoutBox.isAtomicInlineLevelBox());
</span><span class="cx">             auto borderBoxRect = displayBoxRect();
</span><ins>+            contentRightInVisualOrder = borderBoxRect.right();
</ins><span class="cx">             // FIXME: Add ink overflow support for atomic inline level boxes (e.g. box shadow).
</span><span class="cx">             boxes.append({ lineIndex, InlineDisplay::Box::Type::AtomicInlineLevelBox, layoutBox, lineRun.bidiLevel(), borderBoxRect, borderBoxRect, lineRun.expansion(), { } });
</span><span class="cx"> 
</span><span class="lines">@@ -210,8 +211,10 @@
</span><span class="cx">             continue;
</span><span class="cx">         }
</span><span class="cx">         if (lineRun.isInlineBoxStart()) {
</span><ins>+            auto& boxGeometry = formattingState.boxGeometry(layoutBox);
</ins><span class="cx">             // This inline box showed up first on this line.
</span><span class="cx">             auto inlineBoxBorderBox = displayBoxRect();
</span><ins>+            contentRightInVisualOrder += lineRun.logicalWidth();
</ins><span class="cx">             if (lineBox.hasContent()) {
</span><span class="cx">                 // FIXME: It's expected to not have any boxes on empty lines. We should reconsider this.
</span><span class="cx">                 m_inlineBoxIndexMap.add(&layoutBox, boxes.size());
</span><span class="lines">@@ -222,7 +225,6 @@
</span><span class="cx">                 boxes.append({ lineIndex, InlineDisplay::Box::Type::NonRootInlineBox, layoutBox, lineRun.bidiLevel(), inlineBoxBorderBox, inlineBoxBorderBox, { }, { }, inlineBox.hasContent(), isFirstLastBox(inlineBox) });
</span><span class="cx">             }
</span><span class="cx"> 
</span><del>-            auto& boxGeometry = formattingState.boxGeometry(layoutBox);
</del><span class="cx">             auto inlineBoxSize = LayoutSize { LayoutUnit::fromFloatCeil(inlineBoxBorderBox.width()), LayoutUnit::fromFloatCeil(inlineBoxBorderBox.height()) };
</span><span class="cx">             auto logicalRect = Rect { LayoutPoint { inlineBoxBorderBox.topLeft() }, inlineBoxSize };
</span><span class="cx">             boxGeometry.setLogicalTopLeft(logicalRect.topLeft());
</span><span class="lines">@@ -243,6 +245,8 @@
</span><span class="cx"> 
</span><span class="cx">             auto& inlineBox = lineBox.inlineLevelBoxForLayoutBox(layoutBox);
</span><span class="cx">             auto inlineBoxBorderBox = displayBoxRect();
</span><ins>+            // The content right edge should not include the entire inline box here (including its content and right edge).
+            contentRightInVisualOrder += lineRun.logicalWidth();
</ins><span class="cx">             ASSERT(!inlineBox.isFirstBox());
</span><span class="cx">             boxes.append({ lineIndex, InlineDisplay::Box::Type::NonRootInlineBox, layoutBox, lineRun.bidiLevel(), inlineBoxBorderBox, inlineBoxBorderBox, { }, { }, inlineBox.hasContent(), isFirstLastBox(inlineBox) });
</span><span class="cx"> 
</span><span class="lines">@@ -258,7 +262,11 @@
</span><span class="cx">             boxGeometry.setContentBoxWidth(enclosingBorderBoxRect.width() - (boxGeometry.horizontalBorder() + boxGeometry.horizontalPadding().value_or(0_lu)));
</span><span class="cx">             continue;
</span><span class="cx">         }
</span><del>-        ASSERT(lineRun.isInlineBoxEnd() || lineRun.isWordBreakOpportunity());
</del><ins>+        if (lineRun.isInlineBoxEnd()) {
+            contentRightInVisualOrder += lineRun.logicalWidth();
+            continue;
+        }
+        ASSERT(lineRun.isWordBreakOpportunity());
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>