WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/rendering/RenderCounter.cpp

 /**
  * Copyright (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 260 matching lines @@
 }
 
 static void destroyCounterNodeChildren(AtomicStringImpl* identifier, CounterNode* node)
 {
     CounterNode* previous;
     for (CounterNode* child = lastDescendant(node); child && child != node; child = previous) {
         previous = previousInPreOrder(child);
         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;
     }
 }
 
 void RenderCounter::destroyCounterNodes(RenderObject* object)
 {
     CounterMaps& maps = counterMaps();
     CounterMap* map = maps.get(object);
     if (!map)
         return;
     maps.remove(object);
 
     CounterMap::const_iterator end = map->end();
     for (CounterMap::const_iterator it = map->begin(); it != end; ++it) {
         CounterNode* node = it->second;
         destroyCounterNodeChildren(it->first.get(), node);
         if (CounterNode* parent = node->parent())
             parent->removeChild(node);
         delete node;
     }
 
     delete map;
 }
 
 } // namespace WebCore