[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 5d4d5ada156c212429c8af45455b8be7c8bd39b8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 30 08:51:59 2002 +0000

    	Fix for 3000604, 2902173, 2921313.  Ensure that tables recalc their
    	column widths like they are supposed to.  This fixes livepage.apple.com,
    	applemuseum.com, and many other pages (that didn't have bugs filed).
    	Yay!
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::recalcColInfo):
            (RenderTable::addColInfo):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1695 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1a1d9cc..3c449cb 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3000604, 2902173, 2921313.  Ensure that tables recalc their
+	column widths like they are supposed to.  This fixes livepage.apple.com,
+	applemuseum.com, and many other pages (that didn't have bugs filed).
+	Yay!
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::recalcColInfo):
+        (RenderTable::addColInfo):
+
 2002-07-29  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3008660, arstechnica regression.  Move the acquisition
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1a1d9cc..3c449cb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3000604, 2902173, 2921313.  Ensure that tables recalc their
+	column widths like they are supposed to.  This fixes livepage.apple.com,
+	applemuseum.com, and many other pages (that didn't have bugs filed).
+	Yay!
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::recalcColInfo):
+        (RenderTable::addColInfo):
+
 2002-07-29  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3008660, arstechnica regression.  Move the acquisition
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1a1d9cc..3c449cb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3000604, 2902173, 2921313.  Ensure that tables recalc their
+	column widths like they are supposed to.  This fixes livepage.apple.com,
+	applemuseum.com, and many other pages (that didn't have bugs filed).
+	Yay!
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::recalcColInfo):
+        (RenderTable::addColInfo):
+
 2002-07-29  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3008660, arstechnica regression.  Move the acquisition
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index b998acf..3bef72b 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -379,10 +379,19 @@ void RenderTable::recalcColInfo( ColInfo *col )
 
     KHTMLAssert( colInfos[col->span-1]->data()[col->start] == col );
     ColInfoLine *line = (colInfos[col->span-1]);
+#ifdef APPLE_CHANGES
+    // We can't mutate the buffer in place, so we use remove to clear out the item. 
+    // We unset auto-delete so that the |col| is not deleted.  That happens at the
+    // end of the function below. -dwh
+    line->setAutoDelete(false);
+    line->remove(col->start);
+    line->setAutoDelete(true);
+#else
     ColInfo **data = line->data() + col->start;
     *data = 0;
     KHTMLAssert( colInfos[col->span-1]->data()[col->start] == 0 );
-
+#endif
+    
     // add table-column if exists
     RenderObject *child = firstChild();
     while( child ) {
@@ -531,10 +540,10 @@ void RenderTable::addColInfo(int _startCol, int _colSpan,
 	    }
 	}
     }
-#ifndef APPLE_CHANGES
+    
     if ( recalc )
         recalcColInfo( col );
-#endif
+    
     if ( changed )
 	setMinMaxKnown(false);
 

-- 
WebKit Debian packaging