[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 6e600678b45c5d8e5219695ad26795625c23ce6f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 03:18:59 2003 +0000

    	Dump textslaves in the regression tests.
    
            Reviewed by rjw.
    
            * kwq/KWQRenderTreeDebug.cpp:
            (operator<<):
            (write):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3437 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 50352b4..10673db 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2003-01-23  David Hyatt  <hyatt at apple.com>
 
+	Dump textslaves in the regression tests.
+	
+        Reviewed by rjw.
+
+        * kwq/KWQRenderTreeDebug.cpp:
+        (operator<<):
+        (write):
+
+2003-01-23  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3144763, inlines clear too many floats, and jump all the
 	way to the end of the lowest float instead of only moving as far
 	down as they have to in order to fit.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 50352b4..10673db 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-01-23  David Hyatt  <hyatt at apple.com>
 
+	Dump textslaves in the regression tests.
+	
+        Reviewed by rjw.
+
+        * kwq/KWQRenderTreeDebug.cpp:
+        (operator<<):
+        (write):
+
+2003-01-23  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3144763, inlines clear too many floats, and jump all the
 	way to the end of the lowest float instead of only moving as far
 	down as they have to in order to fit.
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index f4f0e28..d8367df 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -175,6 +175,7 @@
 </dict>
 </plist>
 ";
+			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;
diff --git a/WebCore/kwq/KWQRenderTreeDebug.cpp b/WebCore/kwq/KWQRenderTreeDebug.cpp
index 2bcc14a..f610fe5 100644
--- a/WebCore/kwq/KWQRenderTreeDebug.cpp
+++ b/WebCore/kwq/KWQRenderTreeDebug.cpp
@@ -31,6 +31,7 @@
 #include "khtmlview.h"
 #include "render_replaced.h"
 #include "render_table.h"
+#include "render_text.h"
 
 #include "KWQKHTMLPart.h"
 #include "KWQTextStream.h"
@@ -39,6 +40,9 @@ using khtml::RenderLayer;
 using khtml::RenderObject;
 using khtml::RenderTableCell;
 using khtml::RenderWidget;
+using khtml::RenderText;
+using khtml::TextSlave;
+using khtml::TextSlaveArray;
 
 typedef khtml::RenderLayer::RenderLayerElement RenderLayerElement;
 typedef khtml::RenderLayer::RenderZTreeNode RenderZTreeNode;
@@ -50,6 +54,14 @@ static QTextStream &operator<<(QTextStream &ts, const QRect &r)
     return ts << "(" << r.x() << "," << r.y() << "," << r.width() << "," << r.height() << ")";
 }
 
+static QTextStream &operator<<(QTextStream &ts, const TextSlave& slave)
+{
+    ts << "TextSlave at pos (";
+    ts << slave.m_x << "," << slave.m_y << ") with width: " << slave.m_width;
+    ts << "\n"; 
+    return ts;
+}
+
 static QTextStream &operator<<(QTextStream &ts, const RenderObject &o)
 {
     ts << o.renderName();
@@ -89,6 +101,15 @@ static void write(QTextStream &ts, const RenderObject &o, int indent = 0)
     
     ts << o << "\n";
     
+    if (o.isText()) {
+        RenderText* text = (RenderText*)(&o);
+        TextSlaveArray slaves = text->textSlaves();
+        for (unsigned int i = 0; i < slaves.count(); i++) {
+            writeIndent(ts, indent+1);
+            ts << *slaves[i];
+        }
+    }
+
     for (RenderObject *child = o.firstChild(); child; child = child->nextSibling()) {
         if (child->layer()) {
             continue;

-- 
WebKit Debian packaging