Merge 100502

Source/WebCore/rendering/svg/SVGResourcesCache.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 137 matching lines @@
 #if ENABLE(FILTERS)
     SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
     if (resources && resources->filter())
         resources->removeClientFromCache(renderer);
 #endif
 }
 
 void SVGResourcesCache::clientDestroyed(RenderObject* renderer)
 {
     ASSERT(renderer);
+
+    SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
+    if (resources)
+        resources->removeClientFromCache(renderer);
+
     SVGResourcesCache* cache = resourcesCacheFromRenderObject(renderer);
     cache->removeResourcesFromRenderObject(renderer);
 }
 
 void SVGResourcesCache::resourceDestroyed(RenderSVGResourceContainer* resource)
 {
     ASSERT(resource);
     SVGResourcesCache* cache = resourcesCacheFromRenderObject(resource);
 
     // The resource itself may have clients, that need to be notified.
     cache->removeResourcesFromRenderObject(resource);
 
     HashMap<RenderObject*, SVGResources*>::iterator end = cache->m_cache.end();
     for (HashMap<RenderObject*, SVGResources*>::iterator it = cache->m_cache.begin(); it != end; ++it) {
         it->second->resourceDestroyed(resource);
 
         // Mark users of destroyed resources as pending resolution based on the id of the old resource.
         Element* resourceElement = toElement(resource->node());
         SVGStyledElement* clientElement = toSVGStyledElement(it->first->node());
         SVGDocumentExtensions* extensions = clientElement->document()->accessSVGExtensions();
 
         extensions->addPendingResource(resourceElement->fastGetAttribute(HTMLNames::idAttr), clientElement);
     }
 }
 
 }
 
 #endif