Fix for 3665211 (again). Make sure not to leave child line boxes pointing to delete...
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Jul 2004 17:47:40 +0000 (17:47 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Jul 2004 17:47:40 +0000 (17:47 +0000)
        Reviewed by kocienda

        * khtml/rendering/render_block.cpp:
        (khtml::RenderBlock::removeChild):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7129 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/khtml/rendering/render_block.cpp

index 8cf9fc7..e40dd65 100644 (file)
@@ -1,3 +1,12 @@
+2004-07-27  David Hyatt  <hyatt@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@apple.com>
 
        Fixed: WebView scrolls to the top after making an editing change via drag & drop
index 8403907..d844185 100644 (file)
@@ -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();