Changeset 85512 in webkit

Timestamp:

May 2, 2011 1:23:21 PM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-05-02 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

showLineTree/showLineTreeForThis would make working with the line box tree easier
​https://bugs.webkit.org/show_bug.cgi?id=59662

Adding a showLineTree/showLineTreeForThis method to help visualize and debug
the line tree. Also adding a missing showRenderTreeForThis method to RenderObject.

No new tests since this is a debugging feature only and not compiled in release.

• rendering/InlineBox.cpp: (WebCore::InlineBox::showLineTreeForThis): (WebCore::InlineBox::showLineTreeAndMark): (WebCore::InlineBox::showBox): (showLineTree):
• rendering/InlineBox.h:
• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::showLineTreeAndMark):
• rendering/InlineFlowBox.h:
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::showBox):
• rendering/InlineTextBox.h:
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::showLineTreeAndMark):
• rendering/RenderBlock.h:
• rendering/RenderObject.cpp: (WebCore::RenderObject::showRenderTreeForThis): (WebCore::RenderObject::showLineTreeForThis): (showTree): (showLineTree):
• rendering/RenderObject.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineBox.cpp (modified) (2 diffs)
• rendering/InlineBox.h (modified) (2 diffs)
• rendering/InlineFlowBox.cpp (modified) (1 diff)
• rendering/InlineFlowBox.h (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (1 diff)
• rendering/InlineTextBox.h (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (3 diffs)
• rendering/RenderObject.h (modified) (3 diffs)
• rendering/RootInlineBox.cpp (modified) (1 diff)
• rendering/RootInlineBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-02  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        showLineTree/showLineTreeForThis would make working with the line box tree easier
+        https://bugs.webkit.org/show_bug.cgi?id=59662
+
+        Adding a showLineTree/showLineTreeForThis method to help visualize and debug
+        the line tree. Also adding a missing showRenderTreeForThis method to RenderObject.
+
+        No new tests since this is a debugging feature only and not compiled in release.
+
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::showLineTreeForThis):
+        (WebCore::InlineBox::showLineTreeAndMark):
+        (WebCore::InlineBox::showBox):
+        (showLineTree):
+        * rendering/InlineBox.h:
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::showLineTreeAndMark):
+        * rendering/InlineFlowBox.h:
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::showBox):
+        * rendering/InlineTextBox.h:
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::showLineTreeAndMark):
+        * rendering/RenderBlock.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::showRenderTreeForThis):
+        (WebCore::RenderObject::showLineTreeForThis):
+        (showTree):
+        (showLineTree):
+        * rendering/RenderObject.h:
+
 2011-05-02  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -80 +80 @@
 
 #ifndef NDEBUG
+const char* InlineBox::boxName() const
+{
+    return "InlineBox";
+}
+
 void InlineBox::showTreeForThis() const
 {
     if (m_renderer)
         m_renderer->showTreeForThis();
+}
+
+void InlineBox::showLineTreeForThis() const
+{
+    if (m_renderer)
+        m_renderer->containingBlock()->showLineTreeAndMark(this, "*");
+}
+
+void InlineBox::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const RenderObject* obj, int depth) const
+{
+    int printedCharacters = 0;
+    if (this == markedBox1)
+        printedCharacters += fprintf(stderr, "%s", markedLabel1);
+    if (this == markedBox2)
+        printedCharacters += fprintf(stderr, "%s", markedLabel2);
+    if (renderer() == obj)
+        printedCharacters += fprintf(stderr, "*");
+    for (; printedCharacters < depth * 2; printedCharacters++)
+        fputc(' ', stderr);
+
+    showBox(printedCharacters);
+}
+
+void InlineBox::showBox(int printedCharacters) const
+{
+    printedCharacters += fprintf(stderr, "%s\t%p", boxName(), this);
+    for (; printedCharacters < showTreeCharacterOffset; printedCharacters++)
+        fputc(' ', stderr);
+    fprintf(stderr, "\t%s %p\n", renderer() ? renderer()->renderName() : "No Renderer", renderer());
 }
 #endif
@@ -340 +374 @@
 }
 
-#endif
+void showLineTree(const WebCore::InlineBox* b)
+{
+    if (b)
+        b->showLineTreeForThis();
+}
+
+#endif

trunk/Source/WebCore/rendering/InlineBox.h

@@ -148 +148 @@
 #ifndef NDEBUG
     void showTreeForThis() const;
+    void showLineTreeForThis() const;
+    
+    virtual void showBox(int = 0) const;
+    virtual void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0, int = 0) const;
+    virtual const char* boxName() const;
 #endif
 
@@ -387 +392 @@
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const WebCore::InlineBox*);
+void showLineTree(const WebCore::InlineBox*);
 #endif
 

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -1433 +1433 @@
 #ifndef NDEBUG
 
+const char* InlineFlowBox::boxName() const
+{
+    return "InlineFlowBox";
+}
+
+void InlineFlowBox::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const RenderObject* obj, int depth) const
+{
+    InlineBox::showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, depth);
+    for (const InlineBox* box = firstChild(); box; box = box->nextOnLine())
+        box->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, depth + 1);
+}
+
 void InlineFlowBox::checkConsistency() const
 {

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -62 +62 @@
 #ifndef NDEBUG
     virtual ~InlineFlowBox();
+    
+    virtual void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0, int = 0) const;
+    virtual const char* boxName() const;
 #endif
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -1292 +1292 @@
 }
 
+#ifndef NDEBUG
+
+const char* InlineTextBox::boxName() const
+{
+    return "InlineTextBox";
+}
+
+void InlineTextBox::showBox(int printedCharacters) const
+{
+    const RenderText* obj = toRenderText(renderer());
+    String value = obj->text();
+    value = value.substring(start(), len());
+    value.replace('\\', "\\\\");
+    value.replace('\n', "\\n");
+    printedCharacters += fprintf(stderr, "%s\t%p", boxName(), this);
+    for (; printedCharacters < showTreeCharacterOffset; printedCharacters++)
+        fputc(' ', stderr);
+    printedCharacters = fprintf(stderr, "\t%s %p", obj->renderName(), obj);
+    const int rendererCharacterOffset = 24;
+    for (; printedCharacters < rendererCharacterOffset; printedCharacters++)
+        fputc(' ', stderr);
+    fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().data());
+}
+
+#endif
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/InlineTextBox.h

@@ -89 +89 @@
     int logicalLeftVisualOverflow() const { return logicalOverflowRect().x(); }
     int logicalRightVisualOverflow() const { return logicalOverflowRect().maxX(); }
-    
+
+#ifndef NDEBUG
+    virtual void showBox(int = 0) const;
+    virtual const char* boxName() const;
+#endif
 private:
     int selectionTop();

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -6267 +6267 @@
 }
 
+
+#ifndef NDEBUG
+
+void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const RenderObject* obj) const
+{
+    showRenderObject();
+    for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
+        root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, 1);
+}
+
+#endif
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -226 +226 @@
     int logicalLeftOffsetForContent() const { return isHorizontalWritingMode() ? borderLeft() + paddingLeft() : borderTop() + paddingTop(); }
 
+#ifndef NDEBUG
+    void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0) const;
+#endif
 protected:
     // These functions are only used internally to manipulate the render tree structure via remove/insert/appendChildNode.

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1386 +1386 @@
 }
 
+void RenderObject::showRenderTreeForThis() const
+{
+    showRenderTree(this, 0);
+}
+
+void RenderObject::showLineTreeForThis() const
+{
+    if (containingBlock())
+        containingBlock()->showLineTreeAndMark(0, 0, 0, 0, this);
+}
+
 void RenderObject::showRenderObject() const
 {
@@ -1404 +1415 @@
     if (node()) {
         if (printedCharacters)
-            for (; printedCharacters < 39; printedCharacters++)
+            for (; printedCharacters < showTreeCharacterOffset; printedCharacters++)
                 fputc(' ', stderr);
         fputc('\t', stderr);
@@ -2627 +2638 @@
 #ifndef NDEBUG
 
-void showTree(const WebCore::RenderObject* ro)
-{
-    if (ro)
-        ro->showTreeForThis();
+void showTree(const WebCore::RenderObject* object)
+{
+    if (object)
+        object->showTreeForThis();
+}
+
+void showLineTree(const WebCore::RenderObject* object)
+{
+    if (object)
+        object->showLineTreeForThis();
 }
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -108 +108 @@
 #endif
 
+#ifndef NDEBUG
+const int showTreeCharacterOffset = 39;
+#endif
+
 // Base class for all rendering tree objects.
 class RenderObject : public CachedResourceClient {
@@ -223 +227 @@
 #ifndef NDEBUG
     void showTreeForThis() const;
+    void showRenderTreeForThis() const;
+    void showLineTreeForThis() const;
 
     void showRenderObject() const;
@@ -1127 +1133 @@
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const WebCore::RenderObject*);
+void showLineTree(const WebCore::RenderObject*);
 void showRenderTree(const WebCore::RenderObject* object1);
 // We don't make object2 an optional parameter so that showRenderTree

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -814 +814 @@
 }
 
+#ifndef NDEBUG
+const char* RootInlineBox::boxName() const
+{
+    return "RootInlineBox";
+}
+#endif
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -162 +162 @@
     Node* getLogicalStartBoxWithNode(InlineBox*&) const;
     Node* getLogicalEndBoxWithNode(InlineBox*&) const;
+#ifndef NDEBUG
+    virtual const char* boxName() const;
+#endif
 private:
     bool hasEllipsisBox() const { return m_hasEllipsisBoxOrHyphen; }