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

    	Backing out change to render_table.cpp.  The original logic
    	(in version 1.16) is correct.
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::addColInfo):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index be7849a..ed3260c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+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.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColInfo):
+
 2002-09-30  Darin Adler  <darin at apple.com>
 
         * kwq/qt/qobject.h: Add the destroyed signal.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index be7849a..ed3260c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+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.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColInfo):
+
 2002-09-30  Darin Adler  <darin at apple.com>
 
         * kwq/qt/qobject.h: Add the destroyed signal.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index be7849a..ed3260c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+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.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColInfo):
+
 2002-09-30  Darin Adler  <darin at apple.com>
 
         * kwq/qt/qobject.h: Add the destroyed signal.
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index a469a83..791b859 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -509,19 +509,21 @@ 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 if ( _minSize < col->min ) {
+	    } else {
 		col->min = _minSize;
 		col->minCell = _cell;
 		changed = true;
 	    }
 	}
-	if (_maxSize != col->max) {
+	if (_maxSize > col->max)
+	{
 	    if ( allowRecalc && col->maxCell == _cell ) {
 		recalc = true;
-	    } else if (_maxSize > col->max) {
+	    } else {
 		col->max = _maxSize;
 		col->maxCell = _cell;
 		changed = true;

-- 
WebKit Debian packaging