Merge 91725 - REGRESSION (r39725?): Resources removed from document can not be freed until the do...

Source/WebCore/loader/cache/CachedResourceLoader.cpp

Index: Source/WebCore/loader/cache/CachedResourceLoader.cpp
===================================================================
--- Source/WebCore/loader/cache/CachedResourceLoader.cpp	(revision 92201)
+++ Source/WebCore/loader/cache/CachedResourceLoader.cpp	(working copy)
@@ -86,7 +86,6 @@
 CachedResourceLoader::CachedResourceLoader(Document* document)
     : m_document(document)
     , m_requestCount(0)
-    , m_garbageCollectDocumentResourcesTimer(this, &CachedResourceLoader::garbageCollectDocumentResourcesTimerFired)
     , m_autoLoadImages(true)
     , m_loadFinishing(false)
     , m_allowStaleResources(false)
@@ -573,32 +572,8 @@
     if (frame())
         frame()->loader()->loadDone();
     performPostLoadActions();
-
-    if (!m_garbageCollectDocumentResourcesTimer.isActive())
-        m_garbageCollectDocumentResourcesTimer.startOneShot(0);
 }
 
-// Garbage collecting m_documentResources is a workaround for the
-// CachedResourceHandles on the RHS being strong references. Ideally this
-// would be a weak map, however CachedResourceHandles perform additional
-// bookkeeping on CachedResources, so instead pseudo-GC them -- when the
-// reference count reaches 1, m_documentResources is the only reference, so
-// remove it from the map.
-void CachedResourceLoader::garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>* timer)
-{
-    ASSERT_UNUSED(timer, timer == &m_garbageCollectDocumentResourcesTimer);
-
-    Vector<String, 10> toDelete;
-
-    for (DocumentResourceMap::iterator it = m_documentResources.begin(); it != m_documentResources.end(); ++it) {
-        if (it->second->hasOneHandle())
-            toDelete.append(it->first);
-    }
-
-    for (Vector<String, 10>::const_iterator idel = toDelete.begin(); idel != toDelete.end(); ++idel)
-        m_documentResources.remove(*idel);
-}
-
 void CachedResourceLoader::performPostLoadActions()
 {
     checkForPendingPreloads();