[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 67e1d07fbd0bb240dab90587ac13a4f5de34ea5c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 30 18:30:31 2003 +0000

    	Fix for 3438479, tables expand on every layout when a cell has percentage height
    	children.
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTableSection::calcRowHeight):
            (RenderTableRow::layout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5082 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 76f59bf..c8a0376 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-09-29  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3438479, tables expand on every layout when a cell has percentage height
+	children.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::calcRowHeight):
+        (RenderTableRow::layout):
+
 2003-09-29  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3332460>: nil-deref in khtml::RenderWidget::eventFilter with onchange handler
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 76f59bf..c8a0376 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-09-29  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3438479, tables expand on every layout when a cell has percentage height
+	children.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::calcRowHeight):
+        (RenderTableRow::layout):
+
 2003-09-29  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3332460>: nil-deref in khtml::RenderWidget::eventFilter with onchange handler
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 41ea98f..cb33b76 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -988,7 +988,7 @@ void RenderTableSection::calcRowHeight()
 		indx = 0;
 
 	    ch = cell->style()->height().width(0);
-	    if ( cell->height() > ch)
+	    if (cell->height() > ch)
 		ch = cell->height();
 
 	    pos = rowPos[ indx ] + ch + table()->cellSpacing();
@@ -1399,13 +1399,20 @@ void RenderTableRow::layout()
 
     RenderObject *child = firstChild();
     while( child ) {
-	if ( child->isTableCell() && child->needsLayout() ) {
-	    RenderTableCell *cell = static_cast<RenderTableCell *>(child);
-	    cell->calcVerticalMargins();
-	    cell->layout();
-	    cell->setCellTopExtra(0);
-	    cell->setCellBottomExtra(0);
-	}
+        if (child->isTableCell()) {
+            RenderTableCell *cell = static_cast<RenderTableCell *>(child);
+            if (cell->getCellPercentageHeight()) {
+                cell->setCellPercentageHeight(0);
+                if (!cell->needsLayout())
+                    cell->setChildNeedsLayout(true);
+            }
+            if (child->needsLayout()) {
+                cell->calcVerticalMargins();
+                cell->layout();
+                cell->setCellTopExtra(0);
+                cell->setCellBottomExtra(0);
+            }
+        }
 	child = child->nextSibling();
     }
     setNeedsLayout(false);

-- 
WebKit Debian packaging