[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 9c1ea78e1ee62cfb968fd74f896ae39a550e9ba0
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 21 21:24:28 2004 +0000

    	Make sure cells that get flexed vertically in tables don't check text children when looking for
    	percentage height children.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_table.cpp:
            (RenderTableSection::layoutRows):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 453b155..830e692 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>
 
+	Make sure cells that get flexed vertically in tables don't check text children when looking for 
+	percentage height children.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::layoutRows):
+
+2004-04-21  David Hyatt  <hyatt at apple.com>
+
 	Fix for hiermenus bug.  Absolutely positioned images should not contribute to their containing block's
 	max width.  Make sure to disregard positioned elements when computing min/max width.
 	
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index db0a432..8590743 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1291,7 +1291,7 @@ int RenderTableSection::layoutRows( int toAdd )
             bool cellChildrenFlex = false;
             RenderObject* o = cell->firstChild();
             while (o) {
-                if (o->style()->height().isPercent()) {
+                if (!o->isText() && o->style()->height().isPercent()) {
                     o->setNeedsLayout(true, false);
                     cell->setChildNeedsLayout(true, false);
                     cellChildrenFlex = true;

-- 
WebKit Debian packaging