WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/rendering/RenderCounter.cpp

Index: third_party/WebKit/WebCore/rendering/RenderCounter.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderCounter.cpp	(revision 9118)
+++ third_party/WebKit/WebCore/rendering/RenderCounter.cpp	(working copy)
@@ -278,7 +278,11 @@
         child->parent()->removeChild(child);
         ASSERT(counterMaps().get(child->renderer())->get(identifier) == child);
         counterMaps().get(child->renderer())->remove(identifier);
-        child->renderer()->invalidateCounters();
+        if (!child->renderer()->documentBeingDestroyed()) {
+            RenderObjectChildList* children = child->renderer()->virtualChildren();
+            if (children)
+                children->invalidateCounters(child->renderer());
+        }
         delete child;
     }
 }