[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 f8a57d22be4bbb5be11eba3123e48e7cfaea95cd
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 30 23:30:37 2002 +0000

    	Backing myself out again.  No crashes, but now pages stall.
    	#*^&*#@^%*&!!!!
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::recalcColInfo):
            (RenderTable::addColInfo):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1703 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0dec0d2..493e323 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-07-30  David Hyatt  <hyatt at apple.com>
 
+	Backing myself out again.  No crashes, but now pages stall.
+	#*^&*#@^%*&!!!!
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::recalcColInfo):
+        (RenderTable::addColInfo):
+
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
 	Putting my table patch back in.  Also optimizing the code
 	to avoid deleting and recreating the same colinfo over
 	and over again.  Now colinfos can recalc their own
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0dec0d2..493e323 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-07-30  David Hyatt  <hyatt at apple.com>
 
+	Backing myself out again.  No crashes, but now pages stall.
+	#*^&*#@^%*&!!!!
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::recalcColInfo):
+        (RenderTable::addColInfo):
+
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
 	Putting my table patch back in.  Also optimizing the code
 	to avoid deleting and recreating the same colinfo over
 	and over again.  Now colinfos can recalc their own
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0dec0d2..493e323 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-07-30  David Hyatt  <hyatt at apple.com>
 
+	Backing myself out again.  No crashes, but now pages stall.
+	#*^&*#@^%*&!!!!
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::recalcColInfo):
+        (RenderTable::addColInfo):
+
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
 	Putting my table patch back in.  Also optimizing the code
 	to avoid deleting and recreating the same colinfo over
 	and over again.  Now colinfos can recalc their own
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 2e3894b..774a5c8 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -411,6 +411,10 @@ void RenderTable::recalcColInfo( ColInfo *col )
         }
     }
     
+    if (needRecalc)
+        // Null out and delete the column.
+        colInfos[col->span-1]->remove(col->start);
+
     setMinMaxKnown( false );
 
     //qDebug("------------- end recalcColinfo");
@@ -541,8 +545,11 @@ void RenderTable::addColInfo(int _startCol, int _colSpan,
 	}
     }
     
+#ifndef APPLE_CHANGES
+    // #*%^$&#@*^%*& -dwh
     if ( recalc )
         recalcColInfo( col );
+#endif
 
     if ( changed )
 	setMinMaxKnown(false);

-- 
WebKit Debian packaging