[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 be266fc9a10188ce0a407dbbefe15e82a8c134e4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 22 02:24:57 2004 +0000

    	Fix for 3020449, ensure that the paint order of cells with rowspans matches other browsers.
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTableSection::paint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6444 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f8bdd3a..a99e489 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2004-04-21  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3020449, ensure that the paint order of cells with rowspans matches other browsers.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::paint):
+
+2004-04-21  David Hyatt  <hyatt at apple.com>
+
 	Remove the (incorrect) restriction on table flexing that required the cell to have a fixed width.  In
 	reality, the style on the cell is completely irrelevant.
 	
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index a3ff979..c74ee6f 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1418,7 +1418,11 @@ void RenderTableSection::paint(PaintInfo& i, int tx, int ty)
 		RenderTableCell *cell = cellAt(r, c);
 		if (!cell || cell == (RenderTableCell *)-1 )
 		    continue;
-		if ( (r < endrow - 1) && (cellAt(r+1, c) == cell) )
+                
+                // Cells must always paint in the order in which they appear taking into account
+                // their upper left originating row/column.  For cells with rowspans, avoid repainting
+                // if we've already seen the cell.
+		if (r > startrow && (cellAt(r-1, c) == cell))
 		    continue;
 
 #ifdef TABLE_PRINT

-- 
WebKit Debian packaging