[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit f997b4d95e857c612ad8239369a18a5f74acf430
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 17:23:24 2003 +0000

            Reviewed by John.
    
    	- fixed 3140945 -- crash viewing www.nextthing.org
    
            * khtml/rendering/render_container.cpp: (RenderContainer::removeLeftoverAnonymousBoxes):
    	Change this function so it will never remove a table cell. Although a table cell that is
    	created automatically is anonymous, it is not an anonymous box in the sense that this
    	function is trying to deal with. Maybe there will be a better way to fix this some day,
    	but this is the best Dave and I could come up with.
    
    	- fixed 3155700 -- nil-dereference in khtml::RenderTableRow::detach shortly after visiting www.alltheweb.com
    
            * khtml/rendering/render_table.cpp: (RenderTableRow::detach):
    	Check for nil before calling setNeedCellRecalc in case we are being detached after our
    	parent is already nil.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4f5957c..eac979a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2003-01-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3140945 -- crash viewing www.nextthing.org
+
+        * khtml/rendering/render_container.cpp: (RenderContainer::removeLeftoverAnonymousBoxes):
+	Change this function so it will never remove a table cell. Although a table cell that is
+	created automatically is anonymous, it is not an anonymous box in the sense that this
+	function is trying to deal with. Maybe there will be a better way to fix this some day,
+	but this is the best Dave and I could come up with.
+
+	- fixed 3155700 -- nil-dereference in khtml::RenderTableRow::detach shortly after visiting www.alltheweb.com
+
+        * khtml/rendering/render_table.cpp: (RenderTableRow::detach):
+	Check for nil before calling setNeedCellRecalc in case we are being detached after our
+	parent is already nil.
+
 2003-01-23  Richard Williamson   <rjw at apple.com>
 
         Fix for 3152494.  Set the default iframe width to 300 and
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4f5957c..eac979a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2003-01-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3140945 -- crash viewing www.nextthing.org
+
+        * khtml/rendering/render_container.cpp: (RenderContainer::removeLeftoverAnonymousBoxes):
+	Change this function so it will never remove a table cell. Although a table cell that is
+	created automatically is anonymous, it is not an anonymous box in the sense that this
+	function is trying to deal with. Maybe there will be a better way to fix this some day,
+	but this is the best Dave and I could come up with.
+
+	- fixed 3155700 -- nil-dereference in khtml::RenderTableRow::detach shortly after visiting www.alltheweb.com
+
+        * khtml/rendering/render_table.cpp: (RenderTableRow::detach):
+	Check for nil before calling setNeedCellRecalc in case we are being detached after our
+	parent is already nil.
+
 2003-01-23  Richard Williamson   <rjw at apple.com>
 
         Fix for 3152494.  Set the default iframe width to 300 and
diff --git a/WebCore/khtml/rendering/render_container.cpp b/WebCore/khtml/rendering/render_container.cpp
index 8070d3e..02ec17a 100644
--- a/WebCore/khtml/rendering/render_container.cpp
+++ b/WebCore/khtml/rendering/render_container.cpp
@@ -326,7 +326,7 @@ void RenderContainer::removeLeftoverAnonymousBoxes()
     while( child ) {
 	RenderObject *next = child->nextSibling();
 	
-	if ( child->isFlow() && child->isAnonymousBox() && !child->continuation() && !child->childrenInline() ) {
+	if ( child->isFlow() && child->isAnonymousBox() && !child->continuation() && !child->childrenInline() && !child->isTableCell() ) {
 	    RenderObject *firstAnChild = child->firstChild();
 	    RenderObject *lastAnChild = child->lastChild();
 	    if ( firstAnChild ) {
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 77148e9..578ebda 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1262,8 +1262,10 @@ RenderTableRow::RenderTableRow(DOM::NodeImpl* node)
 
 void RenderTableRow::detach(RenderArena* arena)
 {
-    section()->setNeedCellRecalc();
-
+    RenderTableSection *s = section();
+    if (s) {
+        s->setNeedCellRecalc();
+    }
     RenderContainer::detach(arena);
 }
 

-- 
WebKit Debian packaging