[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 06c02db7f09df1dfc6a156bd2bde85524a2edffc
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 3 00:48:17 2003 +0000

    	Do not assume all columns have a minwidth/maxwidth of 1px.
    	Instead give them a min/maxwidth of 0px, and only inflate to
    	1px if a cell originates in the column.
    
    	This fixes the error on travelocity.com, where a large colspan
    	leads to the implicit creation of a new column that contains no
    	originating cells.  That new column should be 0px wide, not
    	1px.
    
    	The bug # is 3170592.
    
            Reviewed by kocienda
    
            * khtml/rendering/table_layout.cpp:
            (AutoTableLayout::recalcColumn):
            * khtml/rendering/table_layout.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4007 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 257c932..f94492a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2003-04-02  David Hyatt  <hyatt at apple.com>
+
+	Do not assume all columns have a minwidth/maxwidth of 1px.
+	Instead give them a min/maxwidth of 0px, and only inflate to
+	1px if a cell originates in the column.
+
+	This fixes the error on travelocity.com, where a large colspan
+	leads to the implicit creation of a new column that contains no
+	originating cells.  That new column should be 0px wide, not 
+	1px.
+
+	The bug # is 3170592.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/table_layout.cpp:
+        (AutoTableLayout::recalcColumn):
+        * khtml/rendering/table_layout.h:
+
 2003-04-01  David Hyatt  <hyatt at apple.com>
 
 	Fix for excite.com.  There are many bugs being fixed that all
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 257c932..f94492a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2003-04-02  David Hyatt  <hyatt at apple.com>
+
+	Do not assume all columns have a minwidth/maxwidth of 1px.
+	Instead give them a min/maxwidth of 0px, and only inflate to
+	1px if a cell originates in the column.
+
+	This fixes the error on travelocity.com, where a large colspan
+	leads to the implicit creation of a new column that contains no
+	originating cells.  That new column should be 0px wide, not 
+	1px.
+
+	The bug # is 3170592.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/table_layout.cpp:
+        (AutoTableLayout::recalcColumn):
+        * khtml/rendering/table_layout.h:
+
 2003-04-01  David Hyatt  <hyatt at apple.com>
 
 	Fix for excite.com.  There are many bugs being fixed that all
diff --git a/WebCore/khtml/rendering/table_layout.cpp b/WebCore/khtml/rendering/table_layout.cpp
index b509718..2861817 100644
--- a/WebCore/khtml/rendering/table_layout.cpp
+++ b/WebCore/khtml/rendering/table_layout.cpp
@@ -394,6 +394,10 @@ void AutoTableLayout::recalcColumn( int effCol )
 		if ( cell == (RenderTableCell *)-1 )
 		    continue;
 		if ( cell && cell->colSpan() == 1 ) {
+                    // A cell originates in this column.  Ensure we have
+                    // a min/max width of at least 1px for this column now.
+                    l.minWidth = QMAX(l.minWidth, 1);
+                    l.maxWidth = QMAX(l.maxWidth, 1);
 		    if ( !cell->minMaxKnown() )
 			cell->calcMinMaxWidth();
 		    if ( cell->minWidth() > l.minWidth )
@@ -439,8 +443,13 @@ void AutoTableLayout::recalcColumn( int effCol )
 			break;
 		    }
 		} else {
-		    if ( !effCol || section->cellAt( i, effCol-1 ) != cell )
+                    if ( cell && (!effCol || section->cellAt( i, effCol-1 ) != cell) ) {
+                        // This spanning cell originates in this column.  Ensure we have
+                        // a min/max width of at least 1px for this column now.
+                        l.minWidth = QMAX(l.minWidth, 1);
+                        l.maxWidth = QMAX(l.maxWidth, 1);
 			insertSpanCell( cell );
+                    }
 		    last = cell;
 		}
 	    }
diff --git a/WebCore/khtml/rendering/table_layout.h b/WebCore/khtml/rendering/table_layout.h
index 496279a..89da01d 100644
--- a/WebCore/khtml/rendering/table_layout.h
+++ b/WebCore/khtml/rendering/table_layout.h
@@ -89,7 +89,7 @@ protected:
     void insertSpanCell( RenderTableCell *cell );
 
     struct Layout {
-	Layout() : minWidth( 1 ), maxWidth( 1 ),
+	Layout() : minWidth( 0 ), maxWidth( 0 ),
 		   effMinWidth( 0 ), effMaxWidth( 0 ),
 		   calcWidth( 0 ) {}
 	Length width;

-- 
WebKit Debian packaging