[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 43bb757e54d16ad275452fc6751b0dc6bb575abf
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 27 19:26:02 2003 +0000

    	This is just a long-standing screwup where I didn't port an old
    	table fix I made to Lars' new table code properly.  The original
    	fix had this check in it.
    
    	The bug is 3171963 (cvs.com).
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTableSection::layoutRows):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3942 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1c009c6..88a70cf 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-03-27  David Hyatt  <hyatt at apple.com>
+
+	This is just a long-standing screwup where I didn't port an old
+	table fix I made to Lars' new table code properly.  The original
+	fix had this check in it.
+
+	The bug is 3171963 (cvs.com).
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::layoutRows):
+
 2003-03-27  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1c009c6..88a70cf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-03-27  David Hyatt  <hyatt at apple.com>
+
+	This is just a long-standing screwup where I didn't port an old
+	table fix I made to Lars' new table code properly.  The original
+	fix had this check in it.
+
+	The bug is 3171963 (cvs.com).
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::layoutRows):
+
 2003-03-27  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 14e8da9..bc92ff4 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1074,7 +1074,8 @@ int RenderTableSection::layoutRows( int toAdd )
             }
             if (cellChildrenFlex) {
                 cell->setCellPercentageHeight(rHeight);
-                cell->layout();
+                if (!cell->layouted())
+                    cell->layout();
            
                 // Alignment within a cell is based off the calculated
                 // height, which becomes irrelevant once the cell has

-- 
WebKit Debian packaging