Merge 126107

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 120 matching lines @@
     RenderObject* lChild = lastChild();
 
     if (lChild) {
         newChild->setPreviousSibling(lChild);
         lChild->setNextSibling(newChild);
     } else
         setFirstChild(newChild);
 
     setLastChild(newChild);
     
-    if (notifyRenderer)
+    if (!owner->documentBeingDestroyed() && notifyRenderer)
         newChild->insertedIntoTree();
 
     if (!owner->documentBeingDestroyed()) {
         RenderCounter::rendererSubtreeAttached(newChild);
     }
     newChild->setNeedsLayoutAndPrefWidthsRecalc(); // Goes up the containing block hierarchy.
     if (!owner->normalChildNeedsLayout())
         owner->setChildNeedsLayout(true); // We may supply the static position for an absolute positioned child.
     
     if (AXObjectCache::accessibilityEnabled())
@@ skipping 19 matching lines @@
 
     RenderObject* prev = beforeChild->previousSibling();
     child->setNextSibling(beforeChild);
     beforeChild->setPreviousSibling(child);
     if (prev)
         prev->setNextSibling(child);
     child->setPreviousSibling(prev);
 
     child->setParent(owner);
     
-    if (notifyRenderer)
+    if (!owner->documentBeingDestroyed() && notifyRenderer)
         child->insertedIntoTree();
 
     if (!owner->documentBeingDestroyed()) {
         RenderCounter::rendererSubtreeAttached(child);
     }
     child->setNeedsLayoutAndPrefWidthsRecalc();
     if (!owner->normalChildNeedsLayout())
         owner->setChildNeedsLayout(true); // We may supply the static position for an absolute positioned child.
     
     if (AXObjectCache::accessibilityEnabled())
@@ skipping 275 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