Changeset 267648 in webkit

Timestamp:

Sep 26, 2020, 10:56:33 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC] Add <wbr> to showLayoutTree
​https://bugs.webkit.org/show_bug.cgi?id=217025

Reviewed by Darin Adler.

This patch also tweaks the inline tree output (one line geometry output per line, different output format).

<div style="width: 100px;">first_line<wbr>second_line</div>

block box at (0,10) size 100x20

line at (0.00,0.00) size 100.00x10.00 baseline at (8.00)
line at (0.00,10.00) size 100.00x10.00 baseline at (8.00)

text run at (0.00,0.00) size 100.00x10.00 run(0, 10)
text run at (0.00,0.00) size 110.00x10.00 run(0, 11)

anonymous inline box (0x495583d20) length->(10) "first_line"
word break opportunity at (100,8) size 0x0 (0x4967c0680)
anonymous inline box (0x495591e00) length->(11) "second_line"

• layout/layouttree/LayoutTreeBuilder.cpp:

(WebCore::Layout::outputInlineRuns):
(WebCore::Layout::outputLayoutBox):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/layouttree/LayoutTreeBuilder.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-26  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Add <wbr> to showLayoutTree
+        https://bugs.webkit.org/show_bug.cgi?id=217025
+
+        Reviewed by Darin Adler.
+
+        This patch also tweaks the inline tree output (one line geometry output per line, different output format).
+
+        <div style="width: 100px;">first_line<wbr>second_line</div>
+
+        block box at (0,10) size 100x20
+            line at (0.00,0.00) size 100.00x10.00 baseline at (8.00)
+            line at (0.00,10.00) size 100.00x10.00 baseline at (8.00)
+          text run at (0.00,0.00) size 100.00x10.00 run(0, 10)
+          text run at (0.00,0.00) size 110.00x10.00 run(0, 11)
+        anonymous inline box (0x495583d20) length->(10) "first_line"
+        word break opportunity at (100,8) size 0x0 (0x4967c0680)
+        anonymous inline box (0x495591e00) length->(11) "second_line"
+
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::outputInlineRuns):
+        (WebCore::Layout::outputLayoutBox):
+
 2020-09-26  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp

@@ -384 +384 @@
     auto& lines = inlineFormattingState.lines();
 
-    unsigned printedCharacters = 0;
-    while (++printedCharacters <= depth * 2)
-        stream << " ";
-    stream << "  ";
-
-    stream << "lines are -> ";
-    for (auto& line : lines)
-        stream << "[" << line.logicalLeft() << "," << line.logicalTop() << " " << line.logicalWidth() << "x" << line.logicalHeight() << "][baseline: " << line.baseline() << "]";
-    stream.nextLine();
+    for (auto& line : lines) {
+        size_t printedCharacters = 0;
+        while (++printedCharacters <= depth * 2)
+            stream << " ";
+        stream << "    line at (" << line.logicalLeft() << "," << line.logicalTop() << ") size " << line.logicalWidth() << "x" << line.logicalHeight() << " baseline at (" << line.baseline() << ")";
+        stream.nextLine();
+    }
 
     for (auto& run : inlineFormattingState.lineRuns()) {
@@ -400 +398 @@
         stream << "  ";
         if (run.text())
-            stream << "inline text box";
+            stream << "text run";
         else
-            stream << "inline box";
+            stream << "box run";
         stream << " at (" << run.logicalLeft() << "," << run.logicalTop() << ") size " << run.logicalWidth() << "x" << run.logicalHeight();
         if (run.text())
@@ -454 +452 @@
         else if (layoutBox.isInlineBlockBox())
             stream << "inline-block box";
-        else if (layoutBox.isInlineBox())
-            stream << "inline box";
+        else if (layoutBox.isLineBreakBox())
+            stream << (downcast<LineBreakBox>(layoutBox).isOptional() ? "word break opportunity" : "line break");
         else if (layoutBox.isAtomicInlineLevelBox())
             stream << "atomic inline level box";
         else if (layoutBox.isReplacedBox())
             stream << "replaced inline box";
-        else if (layoutBox.isLineBreakBox())
-            stream << "line break";
+        else if (layoutBox.isInlineBox())
+            stream << "inline box";
         else
             stream << "other inline level box";