[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 e806c1282e7fac7de4adbfd07f66bc30f7ab4553
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 17:47:40 2004 +0000

    	Fix for 3665211 (again).  Make sure not to leave child line boxes pointing to deleted ancestor line boxes.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::removeChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7129 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8cf9fc7..e40dd65 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-07-27  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3665211 (again).  Make sure not to leave child line boxes pointing to deleted ancestor line boxes.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::removeChild):
+
 2004-07-26  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: WebView scrolls to the top after making an editing change via drag & drop
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 8403907..d844185 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -312,6 +312,7 @@ void RenderBlock::removeChild(RenderObject *oldChild)
         // The remerge has knocked us down to containing only a single anonymous
         // box.  We can go ahead and pull the content right back up into our
         // box.
+        static_cast<RenderBlock*>(prev)->removeChildrenFromLineBoxes();
         RenderObject* anonBlock = removeChildNode(prev);
         m_childrenInline = true;
         RenderObject* o = anonBlock->firstChild();

-- 
WebKit Debian packaging