[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 a80ee3f5a6144cbb0deb5c749bb7df351acfc179
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 30 20:25:10 2002 +0000

    	Make sure to keep the fix checked in for 1.18.  That fix is
    	good.
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::addColInfo):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2210 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ed3260c..2e17948 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-10-01  David Hyatt  <hyatt at apple.com>
 
+	Make sure to keep the fix checked in for 1.18.  That fix is
+	good.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColInfo):
+
+2002-10-01  David Hyatt  <hyatt at apple.com>
+
 	Backing out change to render_table.cpp.  The original logic
 	(in version 1.16) is correct.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ed3260c..2e17948 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-10-01  David Hyatt  <hyatt at apple.com>
 
+	Make sure to keep the fix checked in for 1.18.  That fix is
+	good.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColInfo):
+
+2002-10-01  David Hyatt  <hyatt at apple.com>
+
 	Backing out change to render_table.cpp.  The original logic
 	(in version 1.16) is correct.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ed3260c..2e17948 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-10-01  David Hyatt  <hyatt at apple.com>
 
+	Make sure to keep the fix checked in for 1.18.  That fix is
+	good.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColInfo):
+
+2002-10-01  David Hyatt  <hyatt at apple.com>
+
 	Backing out change to render_table.cpp.  The original logic
 	(in version 1.16) is correct.
 	
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 791b859..b24d7d0 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -509,21 +509,19 @@ void RenderTable::addColInfo(int _startCol, int _colSpan,
 
 	changed = true;
     } else {
-	if (_minSize > col->min)
-	{
+	if (_minSize != col->min) {
 	    if ( allowRecalc && col->minCell == _cell ) {
 		recalc = true;
-	    } else {
+	    } else if ( _minSize > col->min ) {
 		col->min = _minSize;
 		col->minCell = _cell;
 		changed = true;
 	    }
 	}
-	if (_maxSize > col->max)
-	{
+	if (_maxSize != col->max) {
 	    if ( allowRecalc && col->maxCell == _cell ) {
 		recalc = true;
-	    } else {
+	    } else if (_maxSize > col->max) {
 		col->max = _maxSize;
 		col->maxCell = _cell;
 		changed = true;

-- 
WebKit Debian packaging