Changeset 173226 in webkit

Timestamp:

Sep 3, 2014, 2:18:05 PM (11 years ago)

Author:

Simon Fraser

Message:

Dump SimpleLineLayout info in showRenderTree() output
​https://bugs.webkit.org/show_bug.cgi?id=136489

Reviewed by Zalan Bujtas.

Include info about SimpleLineLayout to showRenderTree() output.

Also show RenderText length, and truncate the RenderText contents
to 80 chars (since the string is replicated in inline boxes or simple line layout output).

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::showLineTreeAndMark):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::showRenderObject):

• rendering/SimpleLineLayoutFunctions.cpp:

(WebCore::SimpleLineLayout::printPrefix):
(WebCore::SimpleLineLayout::showLineTreeForFlow):

• rendering/SimpleLineLayoutFunctions.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/SimpleLineLayoutFunctions.cpp (modified) (1 diff)
• rendering/SimpleLineLayoutFunctions.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Dump SimpleLineLayout info in showRenderTree() output
+        https://bugs.webkit.org/show_bug.cgi?id=136489
+
+        Reviewed by Zalan Bujtas.
+        
+        Include info about SimpleLineLayout to showRenderTree() output.
+        
+        Also show RenderText length, and truncate the RenderText contents
+        to 80 chars (since the string is replicated in inline boxes or simple line layout output).
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::showLineTreeAndMark):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::showRenderObject):
+        * rendering/SimpleLineLayoutFunctions.cpp:
+        (WebCore::SimpleLineLayout::printPrefix):
+        (WebCore::SimpleLineLayout::showLineTreeForFlow):
+        * rendering/SimpleLineLayoutFunctions.h:
+
 2014-09-03  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3508 +3508 @@
     for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
         root->showLineTreeAndMark(markedBox, depth);
+
+    if (auto simpleLineLayout = this->simpleLineLayout())
+        SimpleLineLayout::showLineLayoutForFlow(*this, *simpleLineLayout, depth);
 }
 #endif

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1550 +1550 @@
         if (node()->isTextNode()) {
             String value = node()->nodeValue();
+            fprintf(stderr, " length->(%u)", value.length());
+
             value.replaceWithLiteral('\\', "\\\\");
             value.replaceWithLiteral('\n', "\\n");
-            fprintf(stderr, " \"%s\"", value.utf8().data());
+            
+            const int maxPrintedLength = 80;
+            if (value.length() > maxPrintedLength) {
+                String substring = value.substring(0, maxPrintedLength);
+                fprintf(stderr, " \"%s\"...", substring.utf8().data());
+            } else
+                fprintf(stderr, " \"%s\"", value.utf8().data());
         }
     }

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

@@ -201 +201 @@
 }
 
-}
-}
+#ifndef NDEBUG
+static void printPrefix(int& printedCharacters, int depth)
+{
+    fprintf(stderr, "------- --");
+    printedCharacters = 0;
+    while (++printedCharacters <= depth * 2)
+        fputc(' ', stderr);
+}
+
+void showLineLayoutForFlow(const RenderBlockFlow& flow, const Layout& layout, int depth)
+{
+    int printedCharacters = 0;
+    printPrefix(printedCharacters, depth);
+
+    fprintf(stderr, "SimpleLineLayout (%u lines, %u runs) (%p)\n", layout.lineCount(), layout.runCount(), &layout);
+    ++depth;
+
+    auto resolver = runResolver(flow, layout);
+    for (auto it = resolver.begin(), end = resolver.end(); it != end; ++it) {
+        const auto& run = *it;
+        LayoutRect r = run.rect();
+        printPrefix(printedCharacters, depth);
+        fprintf(stderr, "line %u run(%u, %u) (%.2f, %.2f) (%.2f, %.2f) \"%s\"\n", run.lineIndex(), run.start(), run.end(),
+            r.x().toFloat(), r.y().toFloat(), r.width().toFloat(), r.height().toFloat(), run.text().utf8().data());
+    }
+}
+#endif
+
+}
+}

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h

@@ -63 +63 @@
 LayoutUnit lineHeightFromFlow(const RenderBlockFlow&);
 LayoutUnit baselineFromFlow(const RenderBlockFlow&);
+
+#ifndef NDEBUG
+void showLineLayoutForFlow(const RenderBlockFlow&, const Layout&, int depth);
+#endif
 
 }