[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 b1bda391e0d51b66fc604dadea0ca9391b84bd3e
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 15 23:56:08 2002 +0000

    	Fix asserts in tables.
    
            * khtml/rendering/render_table.cpp:
            (RenderTableRow::layout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2703 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6902017..82e161f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
+	Fix asserts in tables.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTableRow::layout):
+
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
 	Fix for whitespace regressions that caused text overlapping
 	and text spilling.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6902017..82e161f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
+	Fix asserts in tables.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTableRow::layout):
+
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
 	Fix for whitespace regressions that caused text overlapping
 	and text spilling.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6902017..82e161f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
+	Fix asserts in tables.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTableRow::layout):
+
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
 	Fix for whitespace regressions that caused text overlapping
 	and text spilling.
 	
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 85596f7..8c14a0b 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -1262,15 +1262,15 @@ static inline RenderObject *next(RenderObject *par, RenderObject *current)
     while(current != 0)
     {
         //kdDebug( 6040 ) << "current = " << current << endl;
-	if(!current->isFloating() && !current->isReplaced() && !current->isPositioned())
-	    next = current->firstChild();
-	if(!next) {
-	    while(current && current != par) {
-		next = current->nextSibling();
-		if(next) break;
-		current = current->parent();
-	    }
-	}
+        if(!current->isFloating() && !current->isReplaced() && !current->isPositioned())
+            next = current->firstChild();
+        if(!next) {
+            while(current && current != par) {
+                next = current->nextSibling();
+                if(next) break;
+                current = current->parent();
+            }
+        }
 
         if(!next) break;
 
@@ -1289,7 +1289,6 @@ void RenderFlow::calcInlineMinMaxWidth()
     int cw = containingBlock()->contentWidth();
 
     RenderObject *child = firstChild();
-    RenderObject *prevchild = 0;
     
     // If we are at the start of a line, we want to ignore all white-space.
     // Also strip spaces if we previously had text that ended in a trailing space.
@@ -1480,7 +1479,6 @@ void RenderFlow::calcInlineMinMaxWidth()
             trailingSpaceChild = 0;
         }
         
-        prevchild = child;
         child = next(this, child);
     }
     
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 7ab2733..8b4837f 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -2034,15 +2034,14 @@ void RenderTableRow::layout()
 
     RenderObject *child = firstChild();
     while( child ) {
-	KHTMLAssert( child->isTableCell() );
-	if ( !child->layouted() ) {
-	    RenderTableCell *cell = static_cast<RenderTableCell *>(child);
-	    cell->calcVerticalMargins();
-	    cell->layout();
-	    cell->setCellTopExtra(0);
-	    cell->setCellBottomExtra(0);
-	}
-	child = child->nextSibling();
+        if (child->isTableCell() && !child->layouted() ) {
+            RenderTableCell *cell = static_cast<RenderTableCell *>(child);
+            cell->calcVerticalMargins();
+            cell->layout();
+            cell->setCellTopExtra(0);
+            cell->setCellBottomExtra(0);
+        }
+        child = child->nextSibling();
     }
     setLayouted();
 }

-- 
WebKit Debian packaging