[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 6dcf3218d98f16c2db533e61034dcfc13fcd5f8b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 21 21:19:25 2003 +0000

    	Fix for 3182596, percentage height tables with cells that specify
    	tiny percentage heights used that height even if it was smaller
    	than the cell's minimum required height.
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTableSection::layoutRows):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4682 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ad134f4..a9b4407 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-07-21  Dave Hyatt  <hyatt at apple.com>
+
+	Fix for 3182596, percentage height tables with cells that specify
+	tiny percentage heights used that height even if it was smaller
+	than the cell's minimum required height.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::layoutRows):
+
 2003-07-21  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ad134f4..a9b4407 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-07-21  Dave Hyatt  <hyatt at apple.com>
+
+	Fix for 3182596, percentage height tables with cells that specify
+	tiny percentage heights used that height even if it was smaller
+	than the cell's minimum required height.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::layoutRows):
+
 2003-07-21  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 8c5cfee..4a94ccb 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1030,7 +1030,7 @@ int RenderTableSection::layoutRows( int toAdd )
 	int totalHeight = rowPos[totalRows] + toAdd;
 // 	qDebug("layoutRows: totalHeight = %d",  totalHeight );
 
-        int dh = totalHeight-rowPos[totalRows];
+        int dh = toAdd;
 	int totalPercent = 0;
 	int numVariable = 0;
 	for ( int r = 0; r < totalRows; r++ ) {
@@ -1048,7 +1048,10 @@ int RenderTableSection::layoutRows( int toAdd )
 	    int rh = rowPos[1]-rowPos[0];
 	    for ( int r = 0; r < totalRows; r++ ) {
 		if ( totalPercent > 0 && grid[r].height.type == Percent ) {
-		    int toAdd = QMIN( dh, (totalHeight * grid[r].height.value / 100)-rh );
+		    int toAdd = QMIN(dh, (totalHeight * grid[r].height.value / 100)-rh);
+                    // If toAdd is negative, then we don't want to shrink the row (this bug
+                    // affected Outlook Web Access).
+                    toAdd = QMAX(0, toAdd);
 		    add += toAdd;
 		    dh -= toAdd;
 		    totalPercent -= grid[r].height.value;

-- 
WebKit Debian packaging