Changeset 219216 in webkit

Timestamp:

Jul 6, 2017 2:13:24 PM (7 years ago)

Author:

Alan Bujtas

Message:

Use WTFLogAlways for debug logging so that it shows up in device system logs
​https://bugs.webkit.org/show_bug.cgi?id=173450

Reviewed by Simon Fraser.

If you want to showRenderTree() on-device, the result doesn't show in system log so you can't see it.
Switch to WTFLogAlways to fix this, for showRenderTree and its dependencies.

• platform/text/TextStream.cpp:

(WebCore::writeIndent):

• rendering/InlineBox.cpp:

(WebCore::InlineBox::showLineTreeAndMark):
(WebCore::InlineBox::showLineBox):

• rendering/InlineBox.h:
• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::showLineTreeAndMark):

• rendering/InlineFlowBox.h:
• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::showLineBox):

• rendering/InlineTextBox.h:
• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::showLineTreeAndMark):

• rendering/RenderBlockFlow.h:
• rendering/RenderObject.cpp:

(WebCore::showRenderTreeLegend):
(WebCore::RenderObject::showRenderTreeForThis):
(WebCore::RenderObject::showLineTreeForThis):
(WebCore::RenderObject::showRegionsInformation):
(WebCore::RenderObject::showRenderObject):
(WebCore::RenderObject::showRenderSubTreeAndMark):

• rendering/RenderObject.h:
• rendering/SimpleLineLayoutFunctions.cpp:

(WebCore::SimpleLineLayout::printPrefix):
(WebCore::SimpleLineLayout::showLineLayoutForFlow):

• rendering/SimpleLineLayoutFunctions.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/TextStream.cpp (modified) (1 diff)
• rendering/InlineBox.cpp (modified) (2 diffs)
• rendering/InlineBox.h (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (1 diff)
• rendering/InlineFlowBox.h (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (3 diffs)
• rendering/InlineTextBox.h (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (1 diff)
• rendering/RenderBlockFlow.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (10 diffs)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/SimpleLineLayoutFunctions.cpp (modified) (2 diffs)
• rendering/SimpleLineLayoutFunctions.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-06  Zalan Bujtas  <zalan@apple.com>
+
+        Use WTFLogAlways for debug logging so that it shows up in device system logs
+        https://bugs.webkit.org/show_bug.cgi?id=173450
+
+        Reviewed by Simon Fraser.
+
+        If you want to showRenderTree() on-device, the result doesn't show in system log so you can't see it.
+        Switch to WTFLogAlways to fix this, for showRenderTree and its dependencies.
+        
+        * platform/text/TextStream.cpp:
+        (WebCore::writeIndent):
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::showLineTreeAndMark):
+        (WebCore::InlineBox::showLineBox):
+        * rendering/InlineBox.h:
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::showLineTreeAndMark):
+        * rendering/InlineFlowBox.h:
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::showLineBox):
+        * rendering/InlineTextBox.h:
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::showLineTreeAndMark):
+        * rendering/RenderBlockFlow.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::showRenderTreeLegend):
+        (WebCore::RenderObject::showRenderTreeForThis):
+        (WebCore::RenderObject::showLineTreeForThis):
+        (WebCore::RenderObject::showRegionsInformation):
+        (WebCore::RenderObject::showRenderObject):
+        (WebCore::RenderObject::showRenderSubTreeAndMark):
+        * rendering/RenderObject.h:
+        * rendering/SimpleLineLayoutFunctions.cpp:
+        (WebCore::SimpleLineLayout::printPrefix):
+        (WebCore::SimpleLineLayout::showLineLayoutForFlow):
+        * rendering/SimpleLineLayoutFunctions.h:
+
 2017-07-06  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/platform/text/TextStream.cpp

@@ -187 +187 @@
 void writeIndent(TextStream& ts, int indent)
 {
-    for (int i = 0; i != indent; ++i)
+    for (int i = 0; i < indent; ++i)
         ts << "  ";
 }

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -28 +28 @@
 #include "RenderLineBreak.h"
 #include "RootInlineBox.h"
+#include "TextStream.h"
 
 #if ENABLE(TREE_DEBUGGING)
@@ -101 +102 @@
 }
 
-void InlineBox::showLineTreeAndMark(const InlineBox* markedBox, int depth) const
-{
-    showLineBox(markedBox == this, depth);
-}
-
-void InlineBox::showLineBox(bool mark, int depth) const
-{
-    fprintf(stderr, "-------- %c-", isDirty() ? 'D' : '-');
+void InlineBox::outputLineTreeAndMark(TextStream& stream, const InlineBox* markedBox, int depth) const
+{
+    outputLineBox(stream, markedBox == this, depth);
+}
+
+void InlineBox::outputLineBox(TextStream& stream, bool mark, int depth) const
+{
+    stream << "-------- " << (isDirty() ? "D" : "-") << "-";
     int printedCharacters = 0;
     if (mark) {
-        fprintf(stderr, "*");
+        stream << "*";
         ++printedCharacters;
     }
     while (++printedCharacters <= depth * 2)
-        fputc(' ', stderr);
-    fprintf(stderr, "%s  (%.2f, %.2f) (%.2f, %.2f) (%p) renderer->(%p)\n", boxName(), x(), y(), width(), height(), this, &renderer());
+        stream << " ";
+    stream << boxName() << " " << FloatRect(x(), y(), width(), height()) << " (" << this << ") renderer->(" << &renderer() << ")";
+    stream.nextLine();
 }
 

trunk/Source/WebCore/rendering/InlineBox.h

@@ -77 +77 @@
     void showLineTreeForThis() const;
     
-    virtual void showLineTreeAndMark(const InlineBox* markedBox, int depth) const;
-    virtual void showLineBox(bool mark, int depth) const;
+    virtual void outputLineTreeAndMark(TextStream&, const InlineBox* markedBox, int depth) const;
+    virtual void outputLineBox(TextStream&, bool mark, int depth) const;
     virtual const char* boxName() const;
 #endif

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -1736 +1736 @@
 }
 
-void InlineFlowBox::showLineTreeAndMark(const InlineBox* markedBox, int depth) const
-{
-    InlineBox::showLineTreeAndMark(markedBox, depth);
+void InlineFlowBox::outputLineTreeAndMark(TextStream& stream, const InlineBox* markedBox, int depth) const
+{
+    InlineBox::outputLineTreeAndMark(stream, markedBox, depth);
     for (const InlineBox* box = firstChild(); box; box = box->nextOnLine())
-        box->showLineTreeAndMark(markedBox, depth + 1);
+        box->outputLineTreeAndMark(stream, markedBox, depth + 1);
 }
 

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -72 +72 @@
 
 #if ENABLE(TREE_DEBUGGING)
-    void showLineTreeAndMark(const InlineBox* markedBox, int depth) const override;
+    void outputLineTreeAndMark(TextStream&, const InlineBox* markedBox, int depth) const override;
     const char* boxName() const override;
 #endif

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -49 +49 @@
 #include "TextPaintStyle.h"
 #include "TextPainter.h"
+#include "TextStream.h"
 #include <stdio.h>
 #include <wtf/text/CString.h>
@@ -1124 +1125 @@
 }
 
-void InlineTextBox::showLineBox(bool mark, int depth) const
-{
-    fprintf(stderr, "-------- %c-", isDirty() ? 'D' : '-');
+void InlineTextBox::outputLineBox(TextStream& stream, bool mark, int depth) const
+{
+    stream << "-------- " << (isDirty() ? "D" : "-") << "-";
 
     int printedCharacters = 0;
     if (mark) {
-        fprintf(stderr, "*");
+        stream << "*";
         ++printedCharacters;
     }
     while (++printedCharacters <= depth * 2)
-        fputc(' ', stderr);
+        stream << " ";
 
     String value = renderer().text();
@@ -1140 +1141 @@
     value.replaceWithLiteral('\\', "\\\\");
     value.replaceWithLiteral('\n', "\\n");
-    fprintf(stderr, "%s  (%.2f, %.2f) (%.2f, %.2f) (%p) renderer->(%p) run(%d, %d) \"%s\"\n", boxName(), x(), y(), width(), height(), this, &renderer(), start(), start() + len(), value.utf8().data());
+    stream << boxName() << " " << FloatRect(x(), y(), width(), height()) << " (" << this << ") renderer->(" << &renderer() << ") run(" << start() << ", " << start() + len() << ") \"" << value.utf8().data() << "\"";
+    stream.nextLine();
 }
 

trunk/Source/WebCore/rendering/InlineTextBox.h

@@ -98 +98 @@
 
 #if ENABLE(TREE_DEBUGGING)
-    void showLineBox(bool mark, int depth) const final;
+    void outputLineBox(TextStream&, bool mark, int depth) const final;
     const char* boxName() const final;
 #endif

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3770 +3770 @@
 
 #if ENABLE(TREE_DEBUGGING)
-void RenderBlockFlow::showLineTreeAndMark(const InlineBox* markedBox, int depth) const
+void RenderBlockFlow::outputLineTreeAndMark(TextStream& stream, const InlineBox* markedBox, int depth) const
 {
     for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
-        root->showLineTreeAndMark(markedBox, depth);
+        root->outputLineTreeAndMark(stream, markedBox, depth);
 
     if (auto simpleLineLayout = this->simpleLineLayout())
-        SimpleLineLayout::showLineLayoutForFlow(*this, *simpleLineLayout, depth);
+        SimpleLineLayout::outputLineLayoutForFlow(stream, *this, *simpleLineLayout, depth);
 }
 #endif

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -373 +373 @@
 
 #if ENABLE(TREE_DEBUGGING)
-    void showLineTreeAndMark(const InlineBox* markedBox, int depth) const;
+    void outputLineTreeAndMark(TextStream&, const InlineBox* markedBox, int depth) const;
 #endif
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -70 +70 @@
 #include "SVGRenderSupport.h"
 #include "StyleResolver.h"
+#include "TextStream.h"
 #include "TransformState.h"
 #include <algorithm>
@@ -1008 +1009 @@
 #if ENABLE(TREE_DEBUGGING)
 
-static void showRenderTreeLegend()
-{
-    fprintf(stderr, "\n(B)lock/(I)nline/I(N)line-block, (A)bsolute/Fi(X)ed/(R)elative/Stic(K)y, (F)loating, (O)verflow clip, Anon(Y)mous, (G)enerated, has(L)ayer, (C)omposited, (+)Dirty style, (+)Dirty layout\n");
+static void outputRenderTreeLegend(TextStream& stream)
+{
+    stream.nextLine();
+    stream << "(B)lock/(I)nline/I(N)line-block, (A)bsolute/Fi(X)ed/(R)elative/Stic(K)y, (F)loating, (O)verflow clip, Anon(Y)mous, (G)enerated, has(L)ayer, (C)omposited, (+)Dirty style, (+)Dirty layout";
+    stream.nextLine();
 }
 
@@ -1025 +1028 @@
     while (root->parent())
         root = root->parent();
-    showRenderTreeLegend();
-    root->showRenderSubTreeAndMark(this, 1);
+    TextStream stream(TextStream::LineMode::MultipleLine, TextStream::Formatting::SVGStyleRect);
+    outputRenderTreeLegend(stream);
+    root->outputRenderSubTreeAndMark(stream, this, 1);
+    WTFLogAlways("%s", stream.release().utf8().data());
 }
 
@@ -1033 +1038 @@
     if (!is<RenderBlockFlow>(*this))
         return;
-    showRenderTreeLegend();
-    showRenderObject(false, 1);
-    downcast<RenderBlockFlow>(*this).showLineTreeAndMark(nullptr, 2);
+    TextStream stream(TextStream::LineMode::MultipleLine, TextStream::Formatting::SVGStyleRect);
+    outputRenderTreeLegend(stream);
+    outputRenderObject(stream, false, 1);
+    downcast<RenderBlockFlow>(*this).outputLineTreeAndMark(stream, nullptr, 2);
+    WTFLogAlways("%s", stream.release().utf8().data());
 }
 
@@ -1055 +1062 @@
 }
 
-void RenderObject::showRegionsInformation() const
+void RenderObject::outputRegionsInformation(TextStream& stream) const
 {
     const RenderFlowThread* ftcb = flowThreadContainingBlockFromRenderer(this);
@@ -1073 +1080 @@
     RenderRegion* endRegion = nullptr;
     ftcb->getRegionRangeForBox(downcast<RenderBox>(this), startRegion, endRegion);
-    fprintf(stderr, " [Rs:%p Re:%p]", startRegion, endRegion);
-}
-
-void RenderObject::showRenderObject(bool mark, int depth) const
+    stream << " [Rs:" << startRegion << " Re:" << endRegion << "]";
+}
+
+void RenderObject::outputRenderObject(TextStream& stream, bool mark, int depth) const
 {
     if (isInlineBlockOrInlineTable())
-        fputc('N', stderr);
+        stream << "N";
     else if (isInline())
-        fputc('I', stderr);
+        stream << "I";
     else
-        fputc('B', stderr);
-    
+        stream << "B";
+
     if (isPositioned()) {
         if (isRelPositioned())
-            fputc('R', stderr);
+            stream << "R";
         else if (isStickyPositioned())
-            fputc('K', stderr);
+            stream << "K";
         else if (isOutOfFlowPositioned()) {
             if (style().position() == AbsolutePosition)
-                fputc('A', stderr);
+                stream << "A";
             else
-                fputc('X', stderr);
+                stream << "X";
         }
     } else
-        fputc('-', stderr);
+        stream << "-";
 
     if (isFloating())
-        fputc('F', stderr);
+        stream << "F";
     else
-        fputc('-', stderr);
+        stream << "-";
 
     if (hasOverflowClip())
-        fputc('O', stderr);
+        stream << "O";
     else
-        fputc('-', stderr);
+        stream << "-";
 
     if (isAnonymous())
-        fputc('Y', stderr);
+        stream << "Y";
     else
-        fputc('-', stderr);
+        stream << "-";
 
     if (isPseudoElement() || isAnonymous())
-        fputc('G', stderr);
+        stream << "G";
     else
-        fputc('-', stderr);
+        stream << "-";
 
     if (hasLayer())
-        fputc('L', stderr);
+        stream << "L";
     else
-        fputc('-', stderr);
+        stream << "-";
 
     if (isComposited())
-        fputc('C', stderr);
+        stream << "C";
     else
-        fputc('-', stderr);
-
-    fputc(' ', stderr);
+        stream << "-";
+
+    stream << " ";
 
     if (node() && node()->needsStyleRecalc())
-        fputc('+', stderr);
+        stream << "+";
     else
-        fputc('-', stderr);
+        stream << "-";
 
     if (needsLayout())
-        fputc('+', stderr);
+        stream << "+";
     else
-        fputc('-', stderr);
+        stream << "-";
 
     int printedCharacters = 0;
     if (mark) {
-        fprintf(stderr, "*");
+        stream << "*";
         ++printedCharacters;
     }
 
     while (++printedCharacters <= depth * 2)
-        fputc(' ', stderr);
+        stream << " ";
 
     if (node())
-        fprintf(stderr, "%s ", node()->nodeName().utf8().data());
+        stream << node()->nodeName().utf8().data() << " ";
 
     String name = renderName();
@@ -1157 +1164 @@
     int pos = name.find('(');
     if (pos > 0)
-        fprintf(stderr, "%s", name.left(pos - 1).utf8().data());
+        stream << name.left(pos - 1).utf8().data();
     else
-        fprintf(stderr, "%s", name.utf8().data());
+        stream << name.utf8().data();
 
     if (is<RenderBox>(*this)) {
@@ -1166 +1173 @@
         if (renderBox.isInFlowPositioned())
             boxRect.move(renderBox.offsetForInFlowPosition());
-        fprintf(stderr, "  (%.2f, %.2f) (%.2f, %.2f)", boxRect.x(), boxRect.y(), boxRect.width(), boxRect.height());
+        stream << " " << boxRect;
     } else if (is<RenderInline>(*this) && isInFlowPositioned()) {
         FloatSize inlineOffset = downcast<RenderInline>(*this).offsetForInFlowPosition();
-        fprintf(stderr, "  (%.2f, %.2f)", inlineOffset.width(), inlineOffset.height());
-    }
-
-    fprintf(stderr, " renderer->(%p)", this);
+        stream << "  (" << inlineOffset.width() << ", " << inlineOffset.height() << ")";
+    }
+
+    stream << " renderer->(" << this << ")";
     if (node()) {
-        fprintf(stderr, " node->(%p)", node());
+        stream << " node->(" << node() << ")";
         if (node()->isTextNode()) {
             String value = node()->nodeValue();
-            fprintf(stderr, " length->(%u)", value.length());
+            stream << " length->(" << value.length() << ")";
 
             value.replaceWithLiteral('\\', "\\\\");
@@ -1185 +1192 @@
             if (value.length() > maxPrintedLength) {
                 String substring = value.substring(0, maxPrintedLength);
-                fprintf(stderr, " \"%s\"...", substring.utf8().data());
+                stream << " \"" << substring.utf8().data() << "\"...";
             } else
-                fprintf(stderr, " \"%s\"", value.utf8().data());
+                stream << " \"" << value.utf8().data() << "\"";
         }
     }
@@ -1193 +1200 @@
         auto& renderer = downcast<RenderBoxModelObject>(*this);
         if (renderer.hasContinuation())
-            fprintf(stderr, " continuation->(%p)", renderer.continuation());
-    }
-    showRegionsInformation();
+            stream << " continuation->(" << renderer.continuation() << ")";
+    }
+    outputRegionsInformation(stream);
     if (needsLayout()) {
-        fprintf(stderr, " layout->");
+        stream << " layout->";
         if (selfNeedsLayout())
-            fprintf(stderr, "[self]");
+            stream << "[self]";
         if (normalChildNeedsLayout())
-            fprintf(stderr, "[normal child]");
+            stream << "[normal child]";
         if (posChildNeedsLayout())
-            fprintf(stderr, "[positioned child]");
+            stream << "[positioned child]";
         if (needsSimplifiedNormalFlowLayout())
-            fprintf(stderr, "[simplified]");
+            stream << "[simplified]";
         if (needsPositionedMovementLayout())
-            fprintf(stderr, "[positioned movement]");
-    }
-    fprintf(stderr, "\n");
-}
-
-void RenderObject::showRenderSubTreeAndMark(const RenderObject* markedObject, int depth) const
-{
-    showRenderObject(markedObject == this, depth);
+            stream << "[positioned movement]";
+    }
+    stream.nextLine();
+}
+
+void RenderObject::outputRenderSubTreeAndMark(TextStream& stream, const RenderObject* markedObject, int depth) const
+{
+    outputRenderObject(stream, markedObject == this, depth);
     if (is<RenderBlockFlow>(*this))
-        downcast<RenderBlockFlow>(*this).showLineTreeAndMark(nullptr, depth + 1);
-
-    for (const RenderObject* child = firstChildSlow(); child; child = child->nextSibling())
-        child->showRenderSubTreeAndMark(markedObject, depth + 1);
+        downcast<RenderBlockFlow>(*this).outputLineTreeAndMark(stream, nullptr, depth + 1);
+
+    for (auto* child = firstChildSlow(); child; child = child->nextSibling())
+        child->outputRenderSubTreeAndMark(stream, markedObject, depth + 1);
 }
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -206 +206 @@
     void showLineTreeForThis() const;
 
-    void showRenderObject(bool mark, int depth) const;
-    void showRenderSubTreeAndMark(const RenderObject* markedObject, int depth) const;
-    void showRegionsInformation() const;
+    void outputRenderObject(TextStream&, bool mark, int depth) const;
+    void outputRenderSubTreeAndMark(TextStream&, const RenderObject* markedObject, int depth) const;
+    void outputRegionsInformation(TextStream&) const;
 #endif
 

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

@@ -47 +47 @@
 #include "TextPaintStyle.h"
 #include "TextPainter.h"
+#include "TextStream.h"
 
 #if ENABLE(TREE_DEBUGGING)
@@ -262 +263 @@
 
 #if ENABLE(TREE_DEBUGGING)
-static void printPrefix(int& printedCharacters, int depth)
-{
-    fprintf(stderr, "-------- --");
+static void printPrefix(TextStream& stream, int& printedCharacters, int depth)
+{
+    stream << "-------- --";
     printedCharacters = 0;
     while (++printedCharacters <= depth * 2)
-        fputc(' ', stderr);
-}
-
-void showLineLayoutForFlow(const RenderBlockFlow& flow, const Layout& layout, int depth)
+        stream << " ";
+}
+
+void outputLineLayoutForFlow(TextStream& stream, 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);
+    printPrefix(stream, printedCharacters, depth);
+
+    stream << "SimpleLineLayout (" << layout.lineCount() << " lines, " << layout.runCount() << " runs) (" << &layout << ")";
+    stream.nextLine();
     ++depth;
 
     for (auto run : runResolver(flow, layout)) {
         FloatRect rect = run.rect();
-        printPrefix(printedCharacters, depth);
+        printPrefix(stream, printedCharacters, depth);
         if (run.start() < run.end()) {
-            fprintf(stderr, "line %u run(%u, %u) (%.2f, %.2f) (%.2f, %.2f) \"%s\"\n", run.lineIndex(), run.start(), run.end(),
-                rect.x(), rect.y(), rect.width(), rect.height(), run.text().toStringWithoutCopying().utf8().data());
+            stream << "line " << run.lineIndex() << " run(" << run.start() << ", " << run.end() << ") " << rect << " \"" << run.text().toStringWithoutCopying().utf8().data() << "\"";
         } else {
             ASSERT(run.start() == run.end());
-            fprintf(stderr, "line break %u run(%u, %u) (%.2f, %.2f) (%.2f, %.2f)\n", run.lineIndex(), run.start(), run.end(), rect.x(), rect.y(), rect.width(), rect.height());
-        }
-    }
+            stream << "line break " << run.lineIndex() << " run(" << run.start() << ", " << run.end() << ") " << rect;
+        }
+    }
+    stream.nextLine();
 }
 #endif

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h

@@ -68 +68 @@
 
 #if ENABLE(TREE_DEBUGGING)
-void showLineLayoutForFlow(const RenderBlockFlow&, const Layout&, int depth);
+void outputLineLayoutForFlow(TextStream&, const RenderBlockFlow&, const Layout&, int depth);
 #endif