[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 67c4753c056f8afadd0b1533abfec0f6d1ee44b9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 2 17:22:17 2003 +0000

    	Make sure that recalcSections always clears out the needSectionRecalc
    	boolean, even in the case where it finds column elements.
    
    	Fixes the assert outlined in bug 3237651.
    
            Reviewed by john
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::recalcSections):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4262 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 885c775..0c01c06 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-05-02  David Hyatt  <hyatt at apple.com>
+
+	Make sure that recalcSections always clears out the needSectionRecalc
+	boolean, even in the case where it finds column elements.
+
+	Fixes the assert outlined in bug 3237651.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::recalcSections):
+
 2003-05-01  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3226030, percentage height tables inside table cells
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 885c775..0c01c06 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-05-02  David Hyatt  <hyatt at apple.com>
+
+	Make sure that recalcSections always clears out the needSectionRecalc
+	boolean, even in the case where it finds column elements.
+
+	Fixes the assert outlined in bug 3237651.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::recalcSections):
+
 2003-05-01  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3226030, percentage height tables inside table cells
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index e41d3bc..f09a1a7 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -568,10 +568,10 @@ void RenderTable::recalcSections()
 
     RenderObject *child = firstChild();
     // We need to get valid pointers to caption, head, foot and firstbody again
-    while ( child ) {
-	switch(child->style()->display()) {
+    while (child && !has_col_elems) {
+	switch (child->style()->display()) {
 	case TABLE_CAPTION:
-	    if ( !tCaption) {
+	    if (!tCaption) {
 		tCaption = static_cast<RenderBlock*>(child);
                 tCaption->setLayouted(false);
             }
@@ -579,7 +579,7 @@ void RenderTable::recalcSections()
 	case TABLE_COLUMN:
 	case TABLE_COLUMN_GROUP:
 	    has_col_elems = true;
-	    return;
+	    break;
 	case TABLE_HEADER_GROUP: {
 	    RenderTableSection *section = static_cast<RenderTableSection *>(child);
 	    if ( !head )

-- 
WebKit Debian packaging