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

<h3>Log Message</h3>
<pre>[LFC][Integration] Bring showRenderTree for IFC integration back
https://bugs.webkit.org/show_bug.cgi?id=233000

Reviewed by Antti Koivisto.

Currently showRenderTree comes back blank for IFC content.

* layout/integration/LayoutIntegrationBoxTree.cpp:
(WebCore::LayoutIntegration::showInlineContent):
* layout/integration/LayoutIntegrationBoxTree.h:
* layout/integration/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::outputLineTree const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationBoxTreecpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationBoxTreeh">trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285781 => 285782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-13 23:04:06 UTC (rev 285781)
+++ trunk/Source/WebCore/ChangeLog      2021-11-13 23:04:43 UTC (rev 285782)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2021-11-13  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [LFC][Integration] Bring showRenderTree for IFC integration back
+        https://bugs.webkit.org/show_bug.cgi?id=233000
+
+        Reviewed by Antti Koivisto.
+
+        Currently showRenderTree comes back blank for IFC content.
+
+        * layout/integration/LayoutIntegrationBoxTree.cpp:
+        (WebCore::LayoutIntegration::showInlineContent):
+        * layout/integration/LayoutIntegrationBoxTree.h:
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::outputLineTree const):
+
+2021-11-13  Alan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC][IFC] Inline box end (opaque to bidi) should get the bidi level from its adjacent content
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=233082
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationBoxTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp (285781 => 285782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp     2021-11-13 23:04:06 UTC (rev 285781)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp        2021-11-13 23:04:43 UTC (rev 285782)
</span><span class="lines">@@ -248,8 +248,79 @@
</span><span class="cx">     return const_cast<BoxTree&>(*this).rendererForLayoutBox(box);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if ENABLE(TREE_DEBUGGING)
+void showInlineContent(TextStream& stream, const InlineContent& inlineContent, size_t depth)
+{
+    auto& lines = inlineContent.lines;
+    auto& boxes = inlineContent.boxes;
+
+    for (size_t lineIndex = 0; lineIndex < lines.size(); ++lineIndex) {
+        auto addSpacing = [&] {
+            size_t printedCharacters = 0;
+            stream << "-------- --";
+            while (++printedCharacters <= depth * 2)
+                stream << " ";
+
+        };
+        addSpacing();
+        auto& line = lines[lineIndex];
+        stream << "line at (" << line.lineBoxLeft() << "," << line.lineBoxTop() << ") size (" << line.lineBoxRight() - line.lineBoxLeft() << "x" << line.lineBoxBottom() - line.lineBoxTop() << ") baseline (" << line.baseline() << ") enclosing top (" << line.enclosingContentTop() << ") bottom (" << line.enclosingContentBottom() << ")";
+        stream.nextLine();
+
+        addSpacing();
+        stream << "  Inline level boxes:";
+        stream.nextLine();
+
+        auto outputInlineLevelBox = [&](const auto& inlineLevelBox) {
+            addSpacing();
+            stream << "    ";
+            auto logicalRect = inlineLevelBox.logicalRect();
+            auto& layoutBox = inlineLevelBox.layoutBox();
+            if (layoutBox.isAtomicInlineLevelBox())
+                stream << "Atomic inline level box";
+            else if (layoutBox.isLineBreakBox())
+                stream << "Line break box";
+            else if (layoutBox.isInlineBox())
+                stream << "Inline box";
+            else
+                stream << "Generic inline level box";
+            stream
+                << " at (" << logicalRect.left() << "," << logicalRect.top() << ")"
+                << " size (" << logicalRect.width() << "x" << logicalRect.height() << ")";
+            stream.nextLine();
+        };
+        for (auto& box : boxes) {
+            if (box.lineIndex() != lineIndex)
+                continue;
+            if (!box.layoutBox().isInlineLevelBox())
+                continue;
+            outputInlineLevelBox(box);
+        }
+
+        addSpacing();
+        stream << "  Runs:";
+        stream.nextLine();
+        for (auto& box : boxes) {
+            if (box.lineIndex() != lineIndex)
+                continue;
+            addSpacing();
+            stream << "    ";
+            if (box.text())
+                stream << "text box";
+            else
+                stream << "box box";
+            stream << " at (" << box.logicalLeft() << "," << box.logicalTop() << ") size " << box.logicalWidth() << "x" << box.logicalHeight();
+            if (box.text())
+                stream << " box(" << box.text()->start() << ", " << box.text()->end() << ")";
+            stream.nextLine();
+        }
+
+    }
</ins><span class="cx"> }
</span><ins>+#endif
+
</ins><span class="cx"> }
</span><ins>+}
</ins><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationBoxTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.h (285781 => 285782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.h       2021-11-13 23:04:06 UTC (rev 285781)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.h  2021-11-13 23:04:43 UTC (rev 285782)
</span><span class="lines">@@ -77,6 +77,9 @@
</span><span class="cx">     HashMap<CheckedRef<const Layout::Box>, RenderObject*> m_boxToRendererMap;
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+#if ENABLE(TREE_DEBUGGING)
+void showInlineContent(TextStream&, const InlineContent&, size_t depth);
+#endif
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (285781 => 285782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp  2021-11-13 23:04:06 UTC (rev 285781)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp     2021-11-13 23:04:43 UTC (rev 285782)
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><span class="cx"> void LineLayout::outputLineTree(WTF::TextStream& stream, size_t depth) const
</span><span class="cx"> {
</span><del>-    showInlineTreeAndRuns(stream, m_layoutState, rootLayoutBox(), depth);
</del><ins>+    showInlineContent(stream, *m_inlineContent, depth);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>