Merge 126048

Source/WebCore/rendering/RenderObjectChildList.cpp

 /*
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 45 matching lines @@
             firstChild()->destroy();
         } else {
             // Destroy any anonymous children remaining in the render tree, as well as implicit (shadow) DOM elements like those used in the engine-based text fields.
             if (firstChild()->node())
                 firstChild()->node()->setRenderer(0);
             firstChild()->destroy();
         }
     }
 }
 
-RenderObject* RenderObjectChildList::removeChildNode(RenderObject* owner, RenderObject* oldChild, bool fullRemove)
+RenderObject* RenderObjectChildList::removeChildNode(RenderObject* owner, RenderObject* oldChild, bool notifyRenderer)
 {
     ASSERT(oldChild->parent() == owner);
 
     if (oldChild->isFloatingOrOutOfFlowPositioned())
         toRenderBox(oldChild)->removeFloatingOrPositionedChildFromBlockLists();
 
     // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
     // that a positioned child got yanked).  We also repaint, so that the area exposed when the child
     // disappears gets repainted properly.
-    if (!owner->documentBeingDestroyed() && fullRemove && oldChild->everHadLayout()) {
+    if (!owner->documentBeingDestroyed() && notifyRenderer && oldChild->everHadLayout()) {
         oldChild->setNeedsLayoutAndPrefWidthsRecalc();
         if (oldChild->isBody())
             owner->view()->repaint();
         else
             oldChild->repaint();
     }
 
     // If we have a line box wrapper, delete it.
     if (oldChild->isBox())
         toRenderBox(oldChild)->deleteLineBoxWrapper();
 
-    if (!owner->documentBeingDestroyed() && fullRemove) {
-        // if we remove visible child from an invisible parent, we don't know the layer visibility any more
-        RenderLayer* layer = 0;
-        if (owner->style()->visibility() != VISIBLE && oldChild->style()->visibility() == VISIBLE && !oldChild->hasLayer()) {
-            if ((layer = owner->enclosingLayer()))
-                layer->dirtyVisibleContentStatus();
-        }
-
-         // Keep our layer hierarchy updated.
-        if (oldChild->firstChild() || oldChild->hasLayer()) {
-            if (!layer)
-                layer = owner->enclosingLayer();
-            oldChild->removeLayers(layer);
-        }
-
-        if (oldChild->isListItem())
-            toRenderListItem(oldChild)->updateListMarkerNumbers();
-
-        if (oldChild->isOutOfFlowPositioned() && owner->childrenInline())
-            owner->dirtyLinesFromChangedChild(oldChild);
-
-        if (oldChild->isRenderRegion())
-            toRenderRegion(oldChild)->detachRegion();
-
-        if (oldChild->isQuote())
-            toRenderQuote(oldChild)->detachQuote();
-
-        if (oldChild->inRenderFlowThread()) {
-            if (oldChild->isBox())
-                oldChild->enclosingRenderFlowThread()->removeRenderBoxRegionInfo(toRenderBox(oldChild));
-            oldChild->enclosingRenderFlowThread()->clearRenderObjectCustomStyle(oldChild);
-        }
-
-        if (RenderNamedFlowThread* containerFlowThread = owner->enclosingRenderNamedFlowThread())
-            containerFlowThread->removeFlowChild(oldChild);
-
-#if ENABLE(SVG)
-        // Update cached boundaries in SVG renderers, if a child is removed.
-        owner->setNeedsBoundariesUpdate();
-#endif
-    }
+    if (!owner->documentBeingDestroyed() && notifyRenderer)
+        oldChild->willBeRemovedFromTree();
     
     // If oldChild is the start or end of the selection, then clear the selection to
     // avoid problems of invalid pointers.
     // FIXME: The FrameSelection should be responsible for this when it
     // is notified of DOM mutations.
     if (!owner->documentBeingDestroyed() && oldChild->isSelectionBorder())
         owner->view()->clearSelection();
 
     // remove the child
     if (oldChild->previousSibling())
@@ skipping 367 matching lines @@
     if (!generatedContentContainer)
         return;
 
     // Handle placement of run-ins. We do the run-in placement at the end since generatedContentContainer can get destroyed.
     RenderObject* generatedContentContainerImmediateParent = generatedContentContainer->parent();
     if (generatedContentContainerImmediateParent->isRenderBlock())
         toRenderBlock(generatedContentContainerImmediateParent)->placeRunInIfNeeded(generatedContentContainer, PlaceGeneratedRunIn);
 }
 
 } // namespace WebCore