[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[inferno at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4cae438a28ae739b22b6e1b1c233f439062d4e71
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 19:09:53 2011 +0000

    2011-01-05  Abhishek Arya  <inferno at chromium.org>
    
            Unreviewed.
    
            Update FIXME comment to sound better. Also initialize the block to fix compile.
    
            * rendering/RenderBlock.cpp:
            (WebCore::RenderBlock::removeChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8c0be51..812ed9e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-05  Abhishek Arya  <inferno at 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 at chromium.org>
+
         Reviewed by Dave Hyatt.
 
         Do not merge anonymous blocks when one of them is the one getting removed.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 94fb382..8895c68 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -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);                

-- 
WebKit Debian packaging