<!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>[287444] 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/287444">287444</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-12-26 09:21:44 -0800 (Sun, 26 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>makeTextLogicalOrderCacheIfNeeded is only interested in whether the content needs visual reordering
https://bugs.webkit.org/show_bug.cgi?id=234687

Reviewed by Antti Koivisto.

This renaming patch is in preparation for fixing the caching codepath for LFC bidi.

* layout/formattingContexts/inline/text/TextUtil.cpp:
(WebCore::Layout::TextUtil::containsStrongDirectionalityText):
(WebCore::Layout::TextUtil::containsBidiText): Deleted.
* layout/formattingContexts/inline/text/TextUtil.h:
* layout/integration/InlineIteratorLogicalOrderTraversal.cpp:
(WebCore::InlineIterator::makeTextLogicalOrderCacheIfNeeded):
* layout/integration/LayoutIntegrationBoxTree.cpp:
(WebCore::LayoutIntegration::BoxTree::buildTree):
* layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::TreeBuilder::createTextBox):
* rendering/RenderText.cpp:
(WebCore::RenderText::RenderText):
(WebCore::RenderText::positionLineBox):
* rendering/RenderText.h:
(WebCore::RenderText::needsVisualReordering const):
(WebCore::RenderText::setNeedsVisualReordering):
(WebCore::RenderText::containsBidiText const): Deleted.
(WebCore::RenderText::setContainsBidiText): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilcpp">trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilh">trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationInlineIteratorLogicalOrderTraversalcpp">trunk/Source/WebCore/layout/integration/InlineIteratorLogicalOrderTraversal.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationBoxTreecpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutlayouttreeLayoutTreeBuildercpp">trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTexth">trunk/Source/WebCore/rendering/RenderText.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287443 => 287444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-26 15:02:35 UTC (rev 287443)
+++ trunk/Source/WebCore/ChangeLog      2021-12-26 17:21:44 UTC (rev 287444)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2021-12-26  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        makeTextLogicalOrderCacheIfNeeded is only interested in whether the content needs visual reordering
+        https://bugs.webkit.org/show_bug.cgi?id=234687
+
+        Reviewed by Antti Koivisto.
+
+        This renaming patch is in preparation for fixing the caching codepath for LFC bidi.
+
+        * layout/formattingContexts/inline/text/TextUtil.cpp:
+        (WebCore::Layout::TextUtil::containsStrongDirectionalityText):
+        (WebCore::Layout::TextUtil::containsBidiText): Deleted.
+        * layout/formattingContexts/inline/text/TextUtil.h:
+        * layout/integration/InlineIteratorLogicalOrderTraversal.cpp:
+        (WebCore::InlineIterator::makeTextLogicalOrderCacheIfNeeded):
+        * layout/integration/LayoutIntegrationBoxTree.cpp:
+        (WebCore::LayoutIntegration::BoxTree::buildTree):
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::TreeBuilder::createTextBox):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::RenderText):
+        (WebCore::RenderText::positionLineBox):
+        * rendering/RenderText.h:
+        (WebCore::RenderText::needsVisualReordering const):
+        (WebCore::RenderText::setNeedsVisualReordering):
+        (WebCore::RenderText::containsBidiText const): Deleted.
+        (WebCore::RenderText::setContainsBidiText): Deleted.
+
+2021-12-26  Alan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC][IFC] ContinuousContent should tell InlineContentBreaker if the candidate content is hanging
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=234671
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp (287443 => 287444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp  2021-12-26 15:02:35 UTC (rev 287443)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp     2021-12-26 17:21:44 UTC (rev 287444)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">     return LineBreakIteratorMode::Default;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool TextUtil::containsBidiText(StringView text)
</del><ins>+bool TextUtil::containsStrongDirectionalityText(StringView text)
</ins><span class="cx"> {
</span><span class="cx">     if (text.is8Bit())
</span><span class="cx">         return false;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h (287443 => 287444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h    2021-12-26 15:02:35 UTC (rev 287443)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h       2021-12-26 17:21:44 UTC (rev 287444)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">     static bool shouldPreserveSpacesAndTabs(const Box&);
</span><span class="cx">     static bool shouldPreserveNewline(const Box&);
</span><span class="cx">     static bool isWrappingAllowed(const RenderStyle&);
</span><del>-    static bool containsBidiText(StringView);
</del><ins>+    static bool containsStrongDirectionalityText(StringView);
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationInlineIteratorLogicalOrderTraversalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/InlineIteratorLogicalOrderTraversal.cpp (287443 => 287444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/InlineIteratorLogicalOrderTraversal.cpp  2021-12-26 15:02:35 UTC (rev 287443)
+++ trunk/Source/WebCore/layout/integration/InlineIteratorLogicalOrderTraversal.cpp     2021-12-26 17:21:44 UTC (rev 287444)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> 
</span><span class="cx"> static TextLogicalOrderCache makeTextLogicalOrderCacheIfNeeded(const RenderText& text)
</span><span class="cx"> {
</span><del>-    if (!text.containsBidiText())
</del><ins>+    if (!text.needsVisualReordering())
</ins><span class="cx">         return { };
</span><span class="cx"> 
</span><span class="cx">     auto cache = makeUnique<TextLogicalOrderCacheData>();
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationBoxTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp (287443 => 287444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp     2021-12-26 15:02:35 UTC (rev 287443)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp        2021-12-26 17:21:44 UTC (rev 287444)
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx">             auto& textRenderer = downcast<RenderText>(childRenderer);
</span><span class="cx">             auto style = RenderStyle::createAnonymousStyleWithDisplay(textRenderer.style(), DisplayType::Inline);
</span><span class="cx">             auto text = style.textSecurity() == TextSecurity::None ? textRenderer.text() : RenderBlock::updateSecurityDiscCharacters(style, textRenderer.text());
</span><del>-            auto containsBidiText = Layout::TextUtil::containsBidiText(text);
</del><ins>+            auto containsBidiText = Layout::TextUtil::containsStrongDirectionalityText(text);
</ins><span class="cx">             if (containsBidiText)
</span><del>-                textRenderer.setContainsBidiText();
</del><ins>+                textRenderer.setNeedsVisualReordering();
</ins><span class="cx">             auto useSimplifiedTextMeasuring = textRenderer.canUseSimplifiedTextMeasuring() && (!firstLineStyle || firstLineStyle->fontCascade() == style.fontCascade());
</span><span class="cx">             return makeUnique<Layout::InlineTextBox>(text, useSimplifiedTextMeasuring, containsBidiText, WTFMove(style), WTFMove(firstLineStyle));
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutlayouttreeLayoutTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp (287443 => 287444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp     2021-12-26 15:02:35 UTC (rev 287443)
+++ trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp        2021-12-26 17:21:44 UTC (rev 287444)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> 
</span><span class="cx"> std::unique_ptr<Box> TreeBuilder::createTextBox(String text, bool canUseSimplifiedTextMeasuring, RenderStyle&& style)
</span><span class="cx"> {
</span><del>-    return makeUnique<InlineTextBox>(text, canUseSimplifiedTextMeasuring, TextUtil::containsBidiText(text), WTFMove(style));
</del><ins>+    return makeUnique<InlineTextBox>(text, canUseSimplifiedTextMeasuring, TextUtil::containsStrongDirectionalityText(text), WTFMove(style));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> std::unique_ptr<Box> TreeBuilder::createLineBreakBox(bool isOptional, RenderStyle&& style)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (287443 => 287444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp    2021-12-26 15:02:35 UTC (rev 287443)
+++ trunk/Source/WebCore/rendering/RenderText.cpp       2021-12-26 17:21:44 UTC (rev 287444)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">     : RenderObject(node)
</span><span class="cx">     , m_hasTab(false)
</span><span class="cx">     , m_linesDirty(false)
</span><del>-    , m_containsBidiText(false)
</del><ins>+    , m_needsVisualReordering(false)
</ins><span class="cx">     , m_isAllASCII(text.impl()->isAllASCII())
</span><span class="cx">     , m_knownToHaveNoOverflowAndNoFallbackFonts(false)
</span><span class="cx">     , m_useBackslashAsYenSymbol(false)
</span><span class="lines">@@ -1517,7 +1517,7 @@
</span><span class="cx"> {
</span><span class="cx">     if (!textBox.hasTextContent())
</span><span class="cx">         return;
</span><del>-    m_containsBidiText |= !textBox.isLeftToRightDirection();
</del><ins>+    m_needsVisualReordering |= !textBox.isLeftToRightDirection();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool RenderText::usesLegacyLineLayoutPath() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.h (287443 => 287444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.h      2021-12-26 15:02:35 UTC (rev 287443)
+++ trunk/Source/WebCore/rendering/RenderText.h 2021-12-26 17:21:44 UTC (rev 287444)
</span><span class="lines">@@ -146,8 +146,8 @@
</span><span class="cx">     int previousOffsetForBackwardDeletion(int current) const final;
</span><span class="cx">     int nextOffset(int current) const final;
</span><span class="cx"> 
</span><del>-    bool containsBidiText() const { return m_containsBidiText; }
-    void setContainsBidiText() { m_containsBidiText = true; }
</del><ins>+    bool needsVisualReordering() const { return m_needsVisualReordering; }
+    void setNeedsVisualReordering() { m_needsVisualReordering = true; }
</ins><span class="cx"> 
</span><span class="cx">     void momentarilyRevealLastTypedCharacter(unsigned offsetAfterLastTypedCharacter);
</span><span class="cx"> 
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">                            // line boxes, and this hint will enable layoutInlineChildren to avoid
</span><span class="cx">                            // just dirtying everything when character data is modified (e.g., appended/inserted
</span><span class="cx">                            // or removed).
</span><del>-    unsigned m_containsBidiText : 1;
</del><ins>+    unsigned m_needsVisualReordering : 1;
</ins><span class="cx">     unsigned m_isAllASCII : 1;
</span><span class="cx">     unsigned m_canUseSimpleFontCodePath : 1;
</span><span class="cx">     mutable unsigned m_knownToHaveNoOverflowAndNoFallbackFonts : 1;
</span></span></pre>
</div>
</div>

</body>
</html>