[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 579936d7a62fbd31fa39380a79e00a33d708a33e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 7 17:53:33 2003 +0000

            Reviewed by Dave.
    
            - fixed 3165171 -- REGRESSION: images overlap text
    
            * khtml/rendering/table_layout.cpp: (AutoTableLayout::calcEffectiveWidth):
            Change to distribute space to the fixed columns first so the code to distribute to non-fixed columns does not
            assume it can distribute more to the fixed columns than it really can.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3594 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7b8f33e..02f897c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2003-02-07  Darin Adler  <darin at apple.com>
 
+        Reviewed by Dave.
+
+        - fixed 3165171 -- REGRESSION: images overlap text
+
+        * khtml/rendering/table_layout.cpp: (AutoTableLayout::calcEffectiveWidth):
+        Change to distribute space to the fixed columns first so the code to distribute to non-fixed columns does not
+        assume it can distribute more to the fixed columns than it really can.
+
+2003-02-07  Darin Adler  <darin at apple.com>
+
         Reviewed by Ken.
 
         - fixed 3167025 -- REGRESSION: http://www.buypcdirect.com doesn't wrap correctly b/c of huge cell width value
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7b8f33e..02f897c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-02-07  Darin Adler  <darin at apple.com>
 
+        Reviewed by Dave.
+
+        - fixed 3165171 -- REGRESSION: images overlap text
+
+        * khtml/rendering/table_layout.cpp: (AutoTableLayout::calcEffectiveWidth):
+        Change to distribute space to the fixed columns first so the code to distribute to non-fixed columns does not
+        assume it can distribute more to the fixed columns than it really can.
+
+2003-02-07  Darin Adler  <darin at apple.com>
+
         Reviewed by Ken.
 
         - fixed 3167025 -- REGRESSION: http://www.buypcdirect.com doesn't wrap correctly b/c of huge cell width value
diff --git a/WebCore/khtml/rendering/table_layout.cpp b/WebCore/khtml/rendering/table_layout.cpp
index a296e6c..7d4fafb 100644
--- a/WebCore/khtml/rendering/table_layout.cpp
+++ b/WebCore/khtml/rendering/table_layout.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2002 Lars Knoll (knoll at kde.org)
  *           (C) 2002 Dirk Mueller (mueller at kde.org)
+ * Copyright (C) 2003 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -698,21 +699,29 @@ int AutoTableLayout::calcEffectiveWidth()
 		qDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d", col, lastCol-1, cMinWidth, minWidth );
 #endif
 		int maxw = maxWidth;
-		for ( unsigned int pos = col; minWidth > 0 && pos < lastCol; pos++ ) {
-
-		    int w;
+		for ( unsigned int pos = col; maxw > 0 && pos < lastCol; pos++ ) {
 		    if ( layoutStruct[pos].width.type == Fixed && haveVariable && fixedWidth <= cMinWidth ) {
-			w = QMAX( layoutStruct[pos].effMinWidth, layoutStruct[pos].width.value );
+			int w = QMAX( layoutStruct[pos].effMinWidth, layoutStruct[pos].width.value );
 			fixedWidth -= layoutStruct[pos].width.value;
-		    } else {
-			w = QMAX( layoutStruct[pos].effMinWidth, cMinWidth * layoutStruct[pos].effMaxWidth / maxw );
-		    }
 #ifdef DEBUG_LAYOUT
-		    qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+                        qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
 #endif
-		    maxw -= layoutStruct[pos].effMaxWidth;
-		    cMinWidth -= w;
-		    layoutStruct[pos].effMinWidth = w;
+                        maxw -= layoutStruct[pos].effMaxWidth;
+                        cMinWidth -= w;
+                        layoutStruct[pos].effMinWidth = w;
+                    }
+		}
+                
+		for ( unsigned int pos = col; maxw > 0 && pos < lastCol; pos++ ) {
+		    if ( !(layoutStruct[pos].width.type == Fixed && haveVariable && fixedWidth <= cMinWidth) ) {
+			int w = QMAX( layoutStruct[pos].effMinWidth, cMinWidth * layoutStruct[pos].effMaxWidth / maxw );
+#ifdef DEBUG_LAYOUT
+                        qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+#endif
+                        maxw -= layoutStruct[pos].effMaxWidth;
+                        cMinWidth -= w;
+                        layoutStruct[pos].effMinWidth = w;
+                    }
 		}
 	    }
 	}

-- 
WebKit Debian packaging