2011-01-05 Abhishek Arya <inferno@chromium.org>
authorinferno@chromium.org <inferno@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Jan 2011 19:09:53 +0000 (19:09 +0000)
committerinferno@chromium.org <inferno@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Jan 2011 19:09:53 +0000 (19:09 +0000)
        Unreviewed.

        Update FIXME comment to sound better. Also initialize the block to fix compile.

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::removeChild):

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

WebCore/ChangeLog
WebCore/rendering/RenderBlock.cpp

index 8c0be51..812ed9e 100644 (file)
@@ -1,5 +1,14 @@
 2011-01-05  Abhishek Arya  <inferno@chromium.org>
 
+        Unreviewed.
+
+        Update FIXME comment to sound better. Also initialize the block to fix compile.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::removeChild):
+
+2011-01-05  Abhishek Arya  <inferno@chromium.org>
+
         Reviewed by Dave Hyatt.
 
         Do not merge anonymous blocks when one of them is the one getting removed.
index 94fb382..8895c68 100644 (file)
@@ -992,8 +992,9 @@ void RenderBlock::removeChild(RenderObject* oldChild)
             // FIXME: When we destroy nextBlock, it might happen that nextBlock's next sibling block and
             // oldChild can get merged. Since oldChild is getting removed, we do not want to move
             // nextBlock's next sibling block's children into it. By setting a fake continuation,
-            // we prevent this from happening.
-            RenderBlock* oldChildBlock;
+            // we prevent this from happening. This is not the best approach, we should replace this
+            // something better later to automatically detect that oldChild is getting removed.
+            RenderBlock* oldChildBlock = 0;
             if (oldChild->isAnonymous() && oldChild->isRenderBlock() && !toRenderBlock(oldChild)->continuation()) {
                 oldChildBlock = toRenderBlock(oldChild);
                 oldChildBlock->setContinuation(oldChildBlock);