[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 9fea24b5d46541eaf0b3cf23081fd5f2f744a476
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 14 20:53:18 2002 +0000

    	Fixed 2925291 -- CSS2 test page causes infinite recursion, crash
    
    	* khtml/rendering/render_container.cpp: (RenderContainer::addChild):
    	Add code to detect the case of a render object that uses text cell
    	style but is not itself a text style, and make sure we don't try to
    	nest such an object inside an infinite number of tables.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 92f7931..13431b8 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-05-14  Darin Adler  <darin at apple.com>
 
+	Fixed 2925291 -- CSS2 test page causes infinite recursion, crash
+
+	* khtml/rendering/render_container.cpp: (RenderContainer::addChild):
+	Add code to detect the case of a render object that uses text cell
+	style but is not itself a text style, and make sure we don't try to
+	nest such an object inside an infinite number of tables.
+
+2002-05-14  Darin Adler  <darin at apple.com>
+
 	* kwq/KWQListImpl.mm: (KWQListIteratorImpl::KWQListIteratorImpl):
 	Add a missing check for a null pointer.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 92f7931..13431b8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-05-14  Darin Adler  <darin at apple.com>
 
+	Fixed 2925291 -- CSS2 test page causes infinite recursion, crash
+
+	* khtml/rendering/render_container.cpp: (RenderContainer::addChild):
+	Add code to detect the case of a render object that uses text cell
+	style but is not itself a text style, and make sure we don't try to
+	nest such an object inside an infinite number of tables.
+
+2002-05-14  Darin Adler  <darin at apple.com>
+
 	* kwq/KWQListImpl.mm: (KWQListIteratorImpl::KWQListIteratorImpl):
 	Add a missing check for a null pointer.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 92f7931..13431b8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-05-14  Darin Adler  <darin at apple.com>
 
+	Fixed 2925291 -- CSS2 test page causes infinite recursion, crash
+
+	* khtml/rendering/render_container.cpp: (RenderContainer::addChild):
+	Add code to detect the case of a render object that uses text cell
+	style but is not itself a text style, and make sure we don't try to
+	nest such an object inside an infinite number of tables.
+
+2002-05-14  Darin Adler  <darin at apple.com>
+
 	* kwq/KWQListImpl.mm: (KWQListIteratorImpl::KWQListIteratorImpl):
 	Add a missing check for a null pointer.
 
diff --git a/WebCore/khtml/rendering/render_container.cpp b/WebCore/khtml/rendering/render_container.cpp
index 45bede5..1d1588d 100644
--- a/WebCore/khtml/rendering/render_container.cpp
+++ b/WebCore/khtml/rendering/render_container.cpp
@@ -96,6 +96,14 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
             //kdDebug( 6040 ) << "adding cell" << endl;
             if ( !isTableRow() )
                 needsTable = true;
+#ifdef APPLE_CHANGES
+            // I'm not 100% sure this is the best way to fix this, but without this
+            // change we recurse infinitely when trying to render the CSS2 test page:
+            // http://www.bath.ac.uk/%7Epy8ieh/internet/eviltests/htmlbodyheadrendering2.html.
+            // See Radar 2925291.
+            if ( isTableCell() && !firstChild() && !newChild->isTableCell() )
+                needsTable = false;
+#endif
             break;
         case NONE:
             kdDebug( 6000 ) << "error in RenderObject::addChild()!!!!" << endl;

-- 
WebKit Debian packaging