Bug 455606 - Remove old cache elements when pushing elements with the same key r/sr=stuart

modules/libpr0n/src/imgLoader.cpp

@@ -643,15 +643,17 @@ PRBool imgLoader::PutIntoCache(nsIURI *key, imgCacheEntry *entry)
     if (!tmpRequest->IsReusable(cacheId))
       return PR_FALSE;
 
-    if (gCacheTracker)
-      gCacheTracker->MarkUsed(tmpCacheEntry);
+    // If it already exists, and we're putting the same key into the cache, we
+    // should remove the old version.
+    PR_LOG(gImgLog, PR_LOG_DEBUG,
+           ("[this=%p] imgLoader::PutIntoCache -- Replacing cached element", nsnull));
 
-    return PR_TRUE;
+    RemoveFromCache(key);
+  } else {
+    PR_LOG(gImgLog, PR_LOG_DEBUG,
+           ("[this=%p] imgLoader::PutIntoCache -- Element NOT already in the cache", nsnull));
   }
 
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgLoader::PutIntoCache -- Element NOT already in the cache", nsnull));
-
   if (!cache.Put(spec, entry))
     return PR_FALSE;