<!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>[285095] 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/285095">285095</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-10-31 10:26:51 -0700 (Sun, 31 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Keep track of the text box offset in ubidi's paragraph content
https://bugs.webkit.org/show_bug.cgi?id=232540

Reviewed by Antti Koivisto.

This hashmap helps to map bidi boundary positions back to inline items.

The paragraph content string holds the InlineTextBox content (and injected control characters)
in DOM order. InlineTextItems hold start/end positions relative to their InlineTextBoxes.
We'll use this hashmap to figure out which InlineTextItems need splitting at bidi boundaries.

* layout/formattingContexts/inline/InlineItemsBuilder.cpp:
(WebCore::Layout::InlineItemsBuilder::handleInlineBox):
(WebCore::Layout::InlineItemsBuilder::enterBidiContext):
(WebCore::Layout::InlineItemsBuilder::exitBidiContext):
* layout/formattingContexts/inline/InlineItemsBuilder.h:</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="#trunkSourceWebCorelayoutformattingContextsinlineInlineItemsBuilderh">trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285094 => 285095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-31 15:18:55 UTC (rev 285094)
+++ trunk/Source/WebCore/ChangeLog      2021-10-31 17:26:51 UTC (rev 285095)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-10-31  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Keep track of the text box offset in ubidi's paragraph content
+        https://bugs.webkit.org/show_bug.cgi?id=232540
+
+        Reviewed by Antti Koivisto.
+
+        This hashmap helps to map bidi boundary positions back to inline items.
+
+        The paragraph content string holds the InlineTextBox content (and injected control characters)
+        in DOM order. InlineTextItems hold start/end positions relative to their InlineTextBoxes.
+        We'll use this hashmap to figure out which InlineTextItems need splitting at bidi boundaries.
+
+        * layout/formattingContexts/inline/InlineItemsBuilder.cpp:
+        (WebCore::Layout::InlineItemsBuilder::handleInlineBox):
+        (WebCore::Layout::InlineItemsBuilder::enterBidiContext):
+        (WebCore::Layout::InlineItemsBuilder::exitBidiContext):
+        * layout/formattingContexts/inline/InlineItemsBuilder.h:
+
</ins><span class="cx"> 2021-10-31  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Scroll animations should run at 120Hz on 120Hz displays
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineItemsBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp (285094 => 285095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp     2021-10-31 15:18:55 UTC (rev 285094)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp        2021-10-31 17:26:51 UTC (rev 285095)
</span><span class="lines">@@ -255,9 +255,9 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (enteringContentControlChar)
</span><del>-        enterBidiContext(inlineBox, *enteringContentControlChar);
</del><ins>+        enterBidiContext(inlineBox, *enteringContentControlChar, inlineItems);
</ins><span class="cx">     if (nestedContentControlChar)
</span><del>-        enterBidiContext(inlineBox, *nestedContentControlChar);
</del><ins>+        enterBidiContext(inlineBox, *nestedContentControlChar, inlineItems);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void InlineItemsBuilder::handleInlineBoxEnd(const Box& inlineBox, InlineItems& inlineItems)
</span><span class="lines">@@ -313,14 +313,36 @@
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InlineItemsBuilder::enterBidiContext(const Box&, UChar)
</del><ins>+void InlineItemsBuilder::enterBidiContext(const Box& box, UChar controlCharacter, const InlineItems& inlineItems)
</ins><span class="cx"> {
</span><del>-    // FIXME: Inject the control character to the paragraph string.
</del><ins>+    if (m_paragraphContentBuilder.isEmpty()) {
+        // FIXME: Move this to a dedicated function to support control characters embedded in text content.
+        auto buildPreviousTextContent = [&] {
+            const Box* lastLayoutBox = nullptr;
+            for (auto& inlineItem : inlineItems) {
+                if (!inlineItem.isText())
+                    continue;
+                auto& layoutBox = inlineItem.layoutBox();
+                if (lastLayoutBox == &layoutBox) {
+                    // We've already appended this content.
+                    continue;
+                }
+                m_contentOffsetMap.set(&layoutBox, m_paragraphContentBuilder.length());
+                m_paragraphContentBuilder.append(downcast<InlineTextBox>(layoutBox).content());
+                lastLayoutBox = &layoutBox;
+            }
+        };
+        buildPreviousTextContent();
+    }
+    // Let the first control character represent the  box.
+    m_contentOffsetMap.add(&box, m_paragraphContentBuilder.length());
+    m_paragraphContentBuilder.append(controlCharacter);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InlineItemsBuilder::exitBidiContext(const Box&, UChar)
</del><ins>+void InlineItemsBuilder::exitBidiContext(const Box&, UChar controlCharacter)
</ins><span class="cx"> {
</span><del>-    // FIXME: Inject the control character to the paragraph string.
</del><ins>+    ASSERT(!m_paragraphContentBuilder.isEmpty());
+    m_paragraphContentBuilder.append(controlCharacter);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineItemsBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.h (285094 => 285095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.h       2021-10-31 15:18:55 UTC (rev 285094)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.h  2021-10-31 17:26:51 UTC (rev 285095)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "InlineFormattingState.h"
</span><span class="cx"> #include "LayoutContainerBox.h"
</span><ins>+#include <wtf/text/StringBuilder.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Layout {
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx">     void handleInlineBoxEnd(const Box&, InlineItems&);
</span><span class="cx">     void handleInlineLevelBox(const Box&, InlineItems&);
</span><span class="cx">     
</span><del>-    void enterBidiContext(const Box&, UChar);
</del><ins>+    void enterBidiContext(const Box&, UChar, const InlineItems&);
</ins><span class="cx">     void exitBidiContext(const Box&, UChar);
</span><span class="cx"> 
</span><span class="cx">     const ContainerBox& root() const { return m_root; }
</span><span class="lines">@@ -56,6 +57,10 @@
</span><span class="cx">     const ContainerBox& m_root;
</span><span class="cx">     // FIXME: We should not need this here. This is only required by the out of flow boxes.
</span><span class="cx">     InlineFormattingState& m_formattingState;
</span><ins>+
+    StringBuilder m_paragraphContentBuilder;
+    // Keep track of where each layout box starts in the paragraph content.
+    HashMap<const Box*, size_t> m_contentOffsetMap;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>