[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 7c6e55200ba3ee3f9927549b95349e7959ec4bbf
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 3 20:05:23 2003 +0000

    	Fix for percentage table heights.  A check was missing to
    	look for a fixed height on the containing block.
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::layoutRows):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index aed4377..8eb157f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-01-03  David Hyatt  <hyatt at apple.com>
+
+	Fix for percentage table heights.  A check was missing to
+	look for a fixed height on the containing block.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layoutRows):
+
 === Alexander-48 ===
 
 2003-01-02  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index aed4377..8eb157f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-01-03  David Hyatt  <hyatt at apple.com>
+
+	Fix for percentage table heights.  A check was missing to
+	look for a fixed height on the containing block.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layoutRows):
+
 === Alexander-48 ===
 
 2003-01-02  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index f7bace8..e32ae14 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1475,13 +1475,16 @@ void RenderTable::layoutRows(int yoff)
         }
         
         if (!c->isTableCell()) {
-            // we need to substract out the margins of this block. -dwh
-            th = h.width(viewRect().height() 
-                - c->marginBottom()
-                - c->marginTop());
-            // not really, but this way the view height change
-            // gets propagated correctly
-            setOverhangingContents();
+            Length ch = c->style()->height();
+            if (ch.isFixed())
+                th = h.width(ch.value);
+            else {
+                // we need to substract out the margins of this block. -dwh
+                th = h.width(viewRect().height() - c->marginBottom() - c->marginTop());
+                // not really, but this way the view height change
+                // gets propagated correctly
+                setOverhangingContents();
+            }
         }
     }
     

-- 
WebKit Debian packaging