Changeset 285782 in webkit

Timestamp:

Nov 13, 2021, 3:04:43 PM (5 years ago)

Author:

Alan Bujtas

Message:

[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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationBoxTree.cpp (modified) (1 diff)
• layout/integration/LayoutIntegrationBoxTree.h (modified) (1 diff)
• layout/integration/LayoutIntegrationLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-13  Alan Bujtas  <zalan@apple.com>
+
+        [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>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp

@@ -249 +249 @@
 }
 
-}
-}
-
-#endif
-
-
+#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();
+        }
+
+    }
+}
+#endif
+
+}
+}
+
+#endif
+
+

trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.h

@@ -78 +78 @@
 };
 
+#if ENABLE(TREE_DEBUGGING)
+void showInlineContent(TextStream&, const InlineContent&, size_t depth);
+#endif
 }
 }

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

@@ -635 +635 @@
 void LineLayout::outputLineTree(WTF::TextStream& stream, size_t depth) const
 {
-    showInlineTreeAndRuns(stream, m_layoutState, rootLayoutBox(), depth);
+    showInlineContent(stream, *m_inlineContent, depth);
 }
 #endif