[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 6e5ba0d6c63054ab758f2c133b1653836e1c2f36
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 13 20:45:45 2003 +0000

    	Add color dumping and bgcolor dumping to the render dump tool.
    
            Reviewed by darin
    
            * kwq/KWQRenderTreeDebug.cpp:
            (operator<<):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3822 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c0e7f2c..712c55e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2003-03-13  David Hyatt  <hyatt at apple.com>
 
+	Add color dumping and bgcolor dumping to the render dump tool.
+	
+        Reviewed by darin
+
+        * kwq/KWQRenderTreeDebug.cpp:
+        (operator<<):
+
+2003-03-13  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3193407, crash in CSS parser on www.hixie.ch.  Improved the grammar to
 	understand the CSS3 :not selector so that it wouldn't think of that case as an
 	error.  Also patched the error handling case that crashed on :not anyway.  Then
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c0e7f2c..712c55e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-03-13  David Hyatt  <hyatt at apple.com>
 
+	Add color dumping and bgcolor dumping to the render dump tool.
+	
+        Reviewed by darin
+
+        * kwq/KWQRenderTreeDebug.cpp:
+        (operator<<):
+
+2003-03-13  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3193407, crash in CSS parser on www.hixie.ch.  Improved the grammar to
 	understand the CSS3 :not selector so that it wouldn't think of that case as an
 	error.  Also patched the error handling case that crashed on :not anyway.  Then
diff --git a/WebCore/kwq/KWQRenderTreeDebug.cpp b/WebCore/kwq/KWQRenderTreeDebug.cpp
index 372070a..cf80ce8 100644
--- a/WebCore/kwq/KWQRenderTreeDebug.cpp
+++ b/WebCore/kwq/KWQRenderTreeDebug.cpp
@@ -77,11 +77,16 @@ static QTextStream &operator<<(QTextStream &ts, const RenderObject &o)
     QRect r(o.xPos(), o.yPos(), o.width(), o.height());
     ts << " " << r;
     
+    if (o.parent() && (o.parent()->style()->color() != o.style()->color()))
+        ts << " [color=" << o.style()->color().name() << "]";
+    if (o.parent() && (o.parent()->style()->backgroundColor() != o.style()->backgroundColor()))
+        ts << " [bgcolor=" << o.style()->backgroundColor().name() << "]";
+
     if (o.isTableCell()) {
         const RenderTableCell &c = static_cast<const RenderTableCell &>(o);
         ts << " [r=" << c.row() << " c=" << c.col() << " rs=" << c.rowSpan() << " cs=" << c.colSpan() << "]";
     }
-
+    
     return ts;
 }
 

-- 
WebKit Debian packaging