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

    	Ok, this time i've got it.  I hope.  I think.  Fingers crossed.
    	Putting the table recalc check back in one more time. :)
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::addColumns):
            (RenderTable::addColInfo):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1704 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 493e323..a9cc3ff 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>
 
+	Ok, this time i've got it.  I hope.  I think.  Fingers crossed.
+	Putting the table recalc check back in one more time. :)
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColumns):
+        (RenderTable::addColInfo):
+
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
 	Backing myself out again.  No crashes, but now pages stall.
 	#*^&*#@^%*&!!!!
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 493e323..a9cc3ff 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>
 
+	Ok, this time i've got it.  I hope.  I think.  Fingers crossed.
+	Putting the table recalc check back in one more time. :)
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColumns):
+        (RenderTable::addColInfo):
+
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
 	Backing myself out again.  No crashes, but now pages stall.
 	#*^&*#@^%*&!!!!
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 493e323..a9cc3ff 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>
 
+	Ok, this time i've got it.  I hope.  I think.  Fingers crossed.
+	Putting the table recalc check back in one more time. :)
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColumns):
+        (RenderTable::addColInfo):
+
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
 	Backing myself out again.  No crashes, but now pages stall.
 	#*^&*#@^%*&!!!!
 	
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 774a5c8..185d516 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -319,12 +319,18 @@ void RenderTable::addColumns( int num )
     // are nulled out when a vector is grown (according to the Qt docs)
     // -dwh
     columnPos.resize(newCols+1);
+    memset( columnPos.data() + totalCols + 1, 0, num*sizeof(int));
     colMaxWidth.resize(newCols);
+    memset( colMaxWidth.data() + totalCols, 0, num*sizeof(int));
     colMinWidth.resize(newCols);
+    memset( colMinWidth.data() + totalCols, 0, num*sizeof(int));
     colValue.resize(newCols);
+    memset( colValue.data() + totalCols, 0, num*sizeof(int));
     colType.resize(newCols);
+    memset( colType.data() + totalCols, 0, num*sizeof(LengthType));
     actColWidth.resize(newCols);
-    
+    memset( actColWidth.data() + totalCols, 0, num*sizeof(LengthType));
+
     for ( unsigned int r = 0; r < allocRows; r++ )
     {
         newCells = new RenderTableCell * [newCols];
@@ -545,11 +551,8 @@ void RenderTable::addColInfo(int _startCol, int _colSpan,
 	}
     }
     
-#ifndef APPLE_CHANGES
-    // #*%^$&#@*^%*& -dwh
     if ( recalc )
         recalcColInfo( col );
-#endif
 
     if ( changed )
 	setMinMaxKnown(false);

-- 
WebKit Debian packaging