[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 b4b81a2192f341e80ebdd64ad0cfed56bcf9f023
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 22 04:37:16 2004 +0000

    	Fix for 3245627, nested tables don't expand vertically.  I actually fixed the basic problem in the
    	previous checkin, but this exposed another basic math error where |numVariable| was not being
    	decremented properly.  This meant space was mis-allocated when multiple variable height rows both needed
    	to expand.
    
            * khtml/rendering/render_table.cpp:
            (RenderTableSection::layoutRows):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a99e489..50239a5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2004-04-21  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3245627, nested tables don't expand vertically.  I actually fixed the basic problem in the
+	previous checkin, but this exposed another basic math error where |numVariable| was not being
+	decremented properly.  This meant space was mis-allocated when multiple variable height rows both needed
+	to expand.
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::layoutRows):
+
+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
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index c74ee6f..43b2c87 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1244,6 +1244,7 @@ int RenderTableSection::layoutRows( int toAdd )
 		    int toAdd = dh/numVariable;
 		    add += toAdd;
 		    dh -= toAdd;
+                    numVariable--;
 		}
                 rowPos[r+1] += add;
 	    }

-- 
WebKit Debian packaging