Merge 117971

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 71 matching lines @@
     HashSet<RenderSVGResourceContainer*> resourceSet;
     resources->buildSetOfResources(resourceSet);
 
     HashSet<RenderSVGResourceContainer*>::iterator end = resourceSet.end();
     for (HashSet<RenderSVGResourceContainer*>::iterator it = resourceSet.begin(); it != end; ++it)
         (*it)->removeClient(object);
 
     delete m_cache.take(object);
 }
 
-static inline SVGResourcesCache* resourcesCacheFromRenderObject(RenderObject* renderer)
+static inline SVGResourcesCache* resourcesCacheFromRenderObject(const RenderObject* renderer)
 {
     Document* document = renderer->document();
     ASSERT(document);
 
     SVGDocumentExtensions* extensions = document->accessSVGExtensions();
     ASSERT(extensions);
 
     SVGResourcesCache* cache = extensions->resourcesCache();
     ASSERT(cache);
 
     return cache;
 }
 
-SVGResources* SVGResourcesCache::cachedResourcesForRenderObject(RenderObject* renderer)
+SVGResources* SVGResourcesCache::cachedResourcesForRenderObject(const RenderObject* renderer)
 {
     ASSERT(renderer);
     SVGResourcesCache* cache = resourcesCacheFromRenderObject(renderer);
     if (!cache->m_cache.contains(renderer))
         return 0;
 
     return cache->m_cache.get(renderer);
 }
 
 void SVGResourcesCache::clientLayoutChanged(RenderObject* object)
@@ skipping 46 matching lines @@
 }
 
 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) {
+    HashMap<const RenderObject*, SVGResources*>::iterator end = cache->m_cache.end();
+    for (HashMap<const 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