Evict CachedResources if they are cancelled due to last client being removed.

Source/core/loader/cache/CachedResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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
@@ skipping 143 matching lines @@
 }
 
 CachedResource::~CachedResource()
 {
     ASSERT(!m_resourceToRevalidate); // Should be true because canDelete() checks this.
     ASSERT(canDelete());
     ASSERT(!inCache());
     ASSERT(!m_deleted);
     ASSERT(url().isNull() || memoryCache()->resourceForURL(KURL(ParsedURLString, url())) != this);
 
+    if (m_cancelTimer.isActive())
+        m_cancelTimer.stop();

[abarth-chromium, 2013/06/18 23:15:26]

This doesn't happen automatically when the timer is destroyed?

[Nate Chapin, 2013/06/18 23:24:48]

Derp, I didn't look in Timer's base class :(

Will remove before landing.

+
 #ifndef NDEBUG
     m_deleted = true;
     cachedResourceLeakCounter.decrement();
 #endif
 }
 
 void CachedResource::failBeforeStarting()
 {
     // FIXME: What if resources in other frames were waiting for this revalidation?
     LOG(ResourceLoading, "Cannot start loading '%s'", url().string().latin1().data());
@@ skipping 266 matching lines @@
             if (url().protocolIs("https"))
                 memoryCache()->remove(this);
         } else
             memoryCache()->prune();
     }
     // This object may be dead here.
 }
 
 void CachedResource::allClientsRemoved()
 {
+    if (!m_loader)
+        return;
     if (m_type == MainResource || m_type == RawResource)
         cancelTimerFired(&m_cancelTimer);
     else if (!m_cancelTimer.isActive())
         m_cancelTimer.startOneShot(0);
 }
 
 void CachedResource::cancelTimerFired(Timer<CachedResource>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_cancelTimer);
     if (hasClients() || !m_loader)
         return;
     m_loader->cancelIfNotFinishing();
+    if (m_status != Cached)
+        memoryCache()->remove(this);
 }
 
 void CachedResource::destroyDecodedDataIfNeeded()
 {
     if (!m_decodedSize)
         return;
 
     if (double interval = memoryCache()->deadDecodedDataDeletionInterval())
         m_decodedDataDeletionTimer.startOneShot(interval);
 }
@@ skipping 410 matching lines @@
     info.addMember(m_proxyResource, "proxyResource");
     info.addMember(m_handlesToRevalidate, "handlesToRevalidate");
     info.addMember(m_options, "options");
     info.addMember(m_decodedDataDeletionTimer, "decodedDataDeletionTimer");
     info.ignoreMember(m_clientsAwaitingCallback);
 
     if (m_purgeableData && !m_purgeableData->wasPurged())
         info.addRawBuffer(m_purgeableData.get(), m_purgeableData->size(), "PurgeableData", "purgeableData");
 }
 }