[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 adb83fa53e2567a01e703eb441d642a94334a16d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 23:36:02 2003 +0000

    	Fix for 3153260, tables used as height spacers don't get the
    	specified height.
    
            Reviewed by rjw
    
            * khtml/rendering/render_table.cpp:
            (RenderTableSection::layoutRows):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3452 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index dacf895..1c3130f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-01-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3153260, tables used as height spacers don't get the
+	specified height.
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::layoutRows):
+
 2003-01-24  Trey Matteson  <trey at apple.com>
 
 	Chris pointed out a FIXME that led to a more contained way to make sure the cursor
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index dacf895..1c3130f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-01-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3153260, tables used as height spacers don't get the
+	specified height.
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::layoutRows):
+
 2003-01-24  Trey Matteson  <trey at apple.com>
 
 	Chris pointed out a FIXME that led to a more contained way to make sure the cursor
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 578ebda..5f9df4c 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -980,7 +980,7 @@ int RenderTableSection::layoutRows( int toAdd )
     int totalRows = grid.size();
     int spacing = table()->cellSpacing();
 
-    if (toAdd && totalRows && rowPos[totalRows]) {
+    if (toAdd && totalRows && (rowPos[totalRows] || !nextSibling())) {
 
 	int totalHeight = rowPos[totalRows] + toAdd;
 // 	qDebug("layoutRows: totalHeight = %d",  totalHeight );

-- 
WebKit Debian packaging