Reviewed by Hyatt
authorkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Sep 2004 17:51:35 +0000 (17:51 +0000)
committerkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Sep 2004 17:51:35 +0000 (17:51 +0000)
        Fix for this bug:

        <rdar://problem/3812939> REGRESSION: move-between-blocks-no-001 editing layout test fails in DeleteSelectionCommandImpl

        * khtml/rendering/render_block.cpp:
        (khtml::RenderBlock::removeChild): Hyatt said this regression was caused by a bad merge.
        Found by code inspection.

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

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

index 1162a76b44f30fc02efb30a1062c74f2c407b5c8..9d11a86d71c3f4c9006815851d4ce42da334ff41 100644 (file)
@@ -1,3 +1,15 @@
+2004-09-24  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by Hyatt
+        
+        Fix for this bug:
+        
+        <rdar://problem/3812939> REGRESSION: move-between-blocks-no-001 editing layout test fails in DeleteSelectionCommandImpl
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::removeChild): Hyatt said this regression was caused by a bad merge. 
+        Found by code inspection.
+
 2004-09-23  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Maciej.
index 9ad08268a33c84a372da5f9eb189e8f38d36fc76..6e91e5a9ea1823b3bb365ca486000b2970d7d759 100644 (file)
@@ -290,7 +290,7 @@ void RenderBlock::removeChild(RenderObject *oldChild)
         // The removal 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.
-        RenderObject* anonBlock = removeChildNode(prev);
+        RenderObject* anonBlock = removeChildNode(child);
         m_childrenInline = true;
         RenderObject* o = anonBlock->firstChild();
         while (o) {