Changeset 259581 in webkit

Timestamp:

Apr 6, 2020, 11:09:10 AM (6 years ago)

Author:

Simon Fraser

Message:

Make RenderObject TextStream-loggable
​https://bugs.webkit.org/show_bug.cgi?id=210035

Post-landing followup. More use of StringBuilder's variadic append. Have Node::debugDescription() include
its address, and have derived classes get the base class debugDescription(). Add an override in Text.

• dom/Element.cpp:

(WebCore::Element::debugDescription const):

• dom/Node.cpp:

(WebCore::Node::debugDescription const):

• dom/Text.cpp:

(WebCore::Text::debugDescription const):
(WebCore::Text::formatForDebugger const):

• dom/Text.h:
• rendering/RenderObject.cpp:

(WebCore::RenderObject::debugDescription const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)
• dom/Node.cpp (modified) (2 diffs)
• dom/Text.cpp (modified) (1 diff)
• dom/Text.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Make RenderObject TextStream-loggable
+        https://bugs.webkit.org/show_bug.cgi?id=210035
+
+        Post-landing followup. More use of StringBuilder's variadic append. Have Node::debugDescription() include
+        its address, and have derived classes get the base class debugDescription(). Add an override in Text.
+
+        * dom/Element.cpp:
+        (WebCore::Element::debugDescription const):
+        * dom/Node.cpp:
+        (WebCore::Node::debugDescription const):
+        * dom/Text.cpp:
+        (WebCore::Text::debugDescription const):
+        (WebCore::Text::formatForDebugger const):
+        * dom/Text.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::debugDescription const):
+
 2020-04-06  Cathie Chen  <cathiechen@igalia.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -2630 +2630 @@
     StringBuilder builder;
 
-    builder.append(nodeName());
-
-    if (hasID()) {
-        builder.appendLiteral(" id=\'");
-        builder.append(getIdAttribute());
-        builder.append('\'');
-    }
+    builder.append(ContainerNode::debugDescription());
+
+    if (hasID())
+        builder.append(" id=\'", getIdAttribute(), '\'');
 
     if (hasClass()) {
         builder.appendLiteral(" class=\'");
         size_t classNamesToDump = classNames().size();
-        const size_t maxNumClassNames = 7;
+        constexpr size_t maxNumClassNames = 7;
         bool addEllipsis = false;
         if (classNamesToDump > maxNumClassNames) {
@@ -2654 +2651 @@
         }
         if (addEllipsis)
-            builder.append("...");
+            builder.append(" ...");
         builder.append('\'');
     }

trunk/Source/WebCore/dom/Node.cpp

@@ -78 +78 @@
 #include "XMLNames.h"
 #include <JavaScriptCore/HeapInlines.h>
+#include <wtf/HexNumber.h>
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/RefCountedLeakCounter.h>
@@ -1755 +1756 @@
 {
     StringBuilder builder;
-
-    builder.append(nodeName());
-
-    if (isTextNode()) {
-        String value = nodeValue();
-        value.replaceWithLiteral('\\', "\\\\");
-        value.replaceWithLiteral('\n', "\\n");
-        
-        const size_t maxDumpLength = 30;
-        if (value.length() > maxDumpLength) {
-            value.truncate(maxDumpLength - 10);
-            value.append("..."_s);
-        }
-        
-        builder.append(' ');
-        builder.append('\"');
-        builder.append(value);
-        builder.append('\"');
-    }
-
+    builder.append(nodeName(), " 0x"_s, hex(reinterpret_cast<uintptr_t>(this), Lowercase));
     return builder.toString();
 }

trunk/Source/WebCore/dom/Text.cpp

@@ -222 +222 @@
 }
 
+String Text::debugDescription() const
+{
+    StringBuilder builder;
+
+    builder.append(CharacterData::debugDescription());
+
+    String value = data();
+    builder.append(" length="_s, value.length());
+
+    value.replaceWithLiteral('\\', "\\\\");
+    value.replaceWithLiteral('\n', "\\n");
+    
+    const size_t maxDumpLength = 30;
+    if (value.length() > maxDumpLength) {
+        value.truncate(maxDumpLength - 10);
+        value.append("..."_s);
+    }
+
+    builder.append(" \"", value, '\"');
+
+    return builder.toString();
+}
+
 #if ENABLE(TREE_DEBUGGING)
 void Text::formatForDebugger(char* buffer, unsigned length) const
 {
-    StringBuilder result;
-    String s;
-
-    result.append(nodeName());
-
-    s = data();
-    if (s.length() > 0) {
-        if (result.length())
-            result.appendLiteral("; ");
-        result.appendLiteral("length=");
-        result.appendNumber(s.length());
-        result.appendLiteral("; value=\"");
-        result.append(s);
-        result.append('"');
-    }
-
-    strncpy(buffer, result.toString().utf8().data(), length - 1);
+    strncpy(buffer, debugDescription().utf8().data(), length - 1);
     buffer[length - 1] = '\0';
 }

trunk/Source/WebCore/dom/Text.h

@@ -56 +56 @@
     void updateRendererAfterContentChange(unsigned offsetOfReplacedData, unsigned lengthOfReplacedData);
 
+    String debugDescription() const final;
+
 protected:
     Text(Document& document, const String& data, ConstructionType type)

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1907 +1907 @@
     StringBuilder builder;
 
-    builder.append(renderName());
-    builder.append(" 0x"_s);
-    builder.append(hex(reinterpret_cast<uintptr_t>(this), Lowercase));
-    builder.append(' ');
-
+    builder.append(renderName(), " 0x"_s, hex(reinterpret_cast<uintptr_t>(this), Lowercase));
     if (node())
-        builder.append(node()->debugDescription());
+        builder.append(' ', node()->debugDescription());
     
     return builder.toString();