<!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>[287395] 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/287395">287395</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-12-23 07:07:24 -0800 (Thu, 23 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Do not try to bidi reorder empty content
https://bugs.webkit.org/show_bug.cgi?id=234623

Reviewed by Antti Koivisto.

* layout/formattingContexts/inline/InlineItemsBuilder.cpp:
(WebCore::Layout::buildBidiParagraph):
(WebCore::Layout::InlineItemsBuilder::breakAndComputeBidiLevels):
* layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::processNonBidiContent):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineItemsBuildercpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlinedisplayInlineDisplayContentBuildercpp">trunk/Source/WebCore/layout/formattingContexts/inline/display/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 (287394 => 287395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-23 14:42:49 UTC (rev 287394)
+++ trunk/Source/WebCore/ChangeLog      2021-12-23 15:07:24 UTC (rev 287395)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2021-12-23  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [LFC][IFC] Do not try to bidi reorder empty content
+        https://bugs.webkit.org/show_bug.cgi?id=234623
+
+        Reviewed by Antti Koivisto.
+
+        * layout/formattingContexts/inline/InlineItemsBuilder.cpp:
+        (WebCore::Layout::buildBidiParagraph):
+        (WebCore::Layout::InlineItemsBuilder::breakAndComputeBidiLevels):
+        * layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::InlineDisplayContentBuilder::processNonBidiContent):
+
+2021-12-23  Alan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC][IFC] Empty bidi inline boxes should not make the line taller
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=234621
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineItemsBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp (287394 => 287395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp     2021-12-23 14:42:49 UTC (rev 287394)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp        2021-12-23 15:07:24 UTC (rev 287395)
</span><span class="lines">@@ -238,8 +238,7 @@
</span><span class="cx">         } else if (inlineItem.isBox()) {
</span><span class="cx">             inlineItemOffsetList.uncheckedAppend({ paragraphContentBuilder.length() });
</span><span class="cx">             paragraphContentBuilder.append(objectReplacementCharacter);
</span><del>-        }
-        else if (inlineItem.isInlineBoxStart() || inlineItem.isInlineBoxEnd()) {
</del><ins>+        } else if (inlineItem.isInlineBoxStart() || inlineItem.isInlineBoxEnd()) {
</ins><span class="cx">             // https://drafts.csswg.org/css-writing-modes/#unicode-bidi
</span><span class="cx">             auto& style = inlineItem.style();
</span><span class="cx">             auto initiatesControlCharacter = style.rtlOrdering() == Order::Logical && style.unicodeBidi() != EUnicodeBidi::UBNormal;
</span><span class="lines">@@ -290,6 +289,12 @@
</span><span class="cx">     InlineItemOffsetList inlineItemOffsets;
</span><span class="cx">     inlineItemOffsets.reserveInitialCapacity(inlineItems.size());
</span><span class="cx">     buildBidiParagraph(root().style(), inlineItems, paragraphContentBuilder, inlineItemOffsets);
</span><ins>+    if (paragraphContentBuilder.isEmpty()) {
+        // Style may trigger visual reordering even on a completely empty content.
+        // e.g. <div><span style="direction:rtl"></span></div>
+        // Let's not try to do bidi handling when there's no content to reorder.
+        return;
+    }
</ins><span class="cx">     ASSERT(inlineItemOffsets.size() == inlineItems.size());
</span><span class="cx">     // 1. Setup the bidi boundary loop by calling ubidi_setPara with the paragraph text.
</span><span class="cx">     // 2. Call ubidi_getLogicalRun to advance to the next bidi boundary until we hit the end of the content.
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlinedisplayInlineDisplayContentBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp (287394 => 287395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp    2021-12-23 14:42:49 UTC (rev 287394)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp       2021-12-23 15:07:24 UTC (rev 287395)
</span><span class="lines">@@ -319,7 +319,12 @@
</span><span class="cx"> 
</span><span class="cx"> void InlineDisplayContentBuilder::processNonBidiContent(const LineBuilder::LineContent& lineContent, const LineBox& lineBox, const InlineDisplay::Line& displayLine, DisplayBoxes& boxes)
</span><span class="cx"> {
</span><del>-    ASSERT(root().style().isLeftToRightDirection());
</del><ins>+#ifndef NDEBUG
+    auto hasContent = false;
+    for (auto& lineRun : lineContent.runs)
+        hasContent = hasContent || lineRun.isText() || lineRun.isBox();
+    ASSERT(root().style().isLeftToRightDirection() || !hasContent);
+#endif
</ins><span class="cx">     auto lineBoxRect = displayLine.lineBoxRect();
</span><span class="cx">     auto contentStartInVisualOrder = lineBoxRect.left() + displayLine.contentLeft();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>