[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 89380fde6f0fdd6673332347f75e58cf0f0f4dd0
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 2 15:52:16 2003 +0000

    	Fix for 3226030, percentage height tables inside table cells
    	don't grow to fill the space inside the cell.  There was
    	a missing edge case here for the case where the table was
    	nested inside a table cell.
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::layout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 23196e5..885c775 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2003-05-01  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3226030, percentage height tables inside table cells
+	don't grow to fill the space inside the cell.  There was
+	a missing edge case here for the case where the table was
+	nested inside a table cell.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layout):
+
+2003-05-01  David Hyatt  <hyatt at apple.com>
+
 	Add a cycle check when importing stylesheets to prevent
 	infinite loops.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 23196e5..885c775 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2003-05-01  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3226030, percentage height tables inside table cells
+	don't grow to fill the space inside the cell.  There was
+	a missing edge case here for the case where the table was
+	nested inside a table cell.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layout):
+
+2003-05-01  David Hyatt  <hyatt at apple.com>
+
 	Add a cycle check when importing stylesheets to prevent
 	infinite loops.
 	
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 2e1dfa4..e41d3bc 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -293,8 +293,14 @@ void RenderTable::layout()
                 break;
             }
         }
-        
-        if (!c->isTableCell()) {
+
+        if (c->isTableCell()) {
+            RenderTableCell* cell = static_cast<RenderTableCell*>(c);
+            int cellHeight = cell->getCellPercentageHeight();
+            if (cellHeight && cell->style()->height().isFixed())
+                th = h.width(cellHeight);
+        }
+        else  {
             Length ch = c->style()->height();
             if (ch.isFixed())
                 th = h.width(ch.value);

-- 
WebKit Debian packaging