Move ResourceClient to Oilpan heap

third_party/WebKit/Source/core/fetch/MemoryCache.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) 2004, 2005, 2006, 2007, 2008 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
     version 2 of the License, or (at your option) any later version.
@@ skipping 241 matching lines @@
     // The list might not be sorted by the m_lastDecodedFrameTimeStamp. The impact
     // of this weaker invariant is minor as the below if statement to check the
     // elapsedTime will evaluate to false as the current time will be a lot
     // greater than the current->m_lastDecodedFrameTimeStamp.
     // For more details see: https://bugs.webkit.org/show_bug.cgi?id=30209
 
     MemoryCacheEntry* current = m_liveDecodedResources.m_tail;
     while (current) {
         Resource* resource = current->resource();
         MemoryCacheEntry* previous = current->m_previousInLiveResourcesList;
-        ASSERT(resource->hasClientsOrObservers());
+        DCHECK(resource->isAlive());
 
         if (resource->isLoaded() && resource->decodedSize()) {
             // Check to see if the remaining resources are too new to prune.
             double elapsedTime = m_pruneFrameTimeStamp - current->m_lastDecodedAccessTime;
             if (strategy == AutomaticPrune && elapsedTime < m_delayBeforeLiveDecodedPrune)
                 return;
 
             // Destroy our decoded data if possible. This will remove us
             // from m_liveDecodedResources, and possibly move us to a
             // different LRU list in m_allResources.
@@ skipping 31 matching lines @@
             MemoryCacheEntry* previous = current->m_previousInAllResourcesList;
 
             // Decoded data may reference other resources. Skip |current| if
             // |current| somehow got kicked out of cache during
             // destroyDecodedData().
             if (!resource || !contains(resource)) {
                 current = previous;
                 continue;
             }
 
-            if (!resource->hasClientsOrObservers() && !resource->isPreloaded() && resource->isLoaded()) {
+            if (!resource->isAlive() && !resource->isPreloaded() && resource->isLoaded()) {
                 // Destroy our decoded data. This will remove us from
                 // m_liveDecodedResources, and possibly move us to a different
                 // LRU list in m_allResources.
                 resource->prune();
 
                 if (targetSize && m_deadSize <= targetSize)
                     return;
             }
             current = previous;
         }
 
         // Now evict objects from this queue.
         current = m_allResources[i].m_tail;
         while (current) {
             Resource* resource = current->resource();
             MemoryCacheEntry* previous = current->m_previousInAllResourcesList;
             if (!resource || !contains(resource)) {
                 current = previous;
                 continue;
             }
-            if (!resource->hasClientsOrObservers() && !resource->isPreloaded()) {
+            if (!resource->isAlive() && !resource->isPreloaded()) {
                 evict(current);
                 if (targetSize && m_deadSize <= targetSize)
                     return;
             }
             current = previous;
         }
 
         // Shrink the vector back down so we don't waste time inspecting
         // empty LRU lists on future prunes.
         if (m_allResources[i].m_head)
@@ skipping 192 matching lines @@
     // The object must now be moved to a different queue, since either its size or its accessCount has been changed,
     // and both of those are used to determine which LRU queue the resource should be in.
     if (oldSize)
         removeFromLRUList(entry, lruListFor(entry->m_accessCount, oldSize));
     if (wasAccessed)
         entry->m_accessCount++;
     if (newSize)
         insertInLRUList(entry, lruListFor(entry->m_accessCount, newSize));
 
     ptrdiff_t delta = newSize - oldSize;
-    if (resource->hasClientsOrObservers()) {
+    if (resource->isAlive()) {
         ASSERT(delta >= 0 || m_liveSize >= static_cast<size_t>(-delta) );
         m_liveSize += delta;
     } else {
         ASSERT(delta >= 0 || m_deadSize >= static_cast<size_t>(-delta) );
         m_deadSize += delta;
     }
 }
 
 void MemoryCache::updateDecodedResource(Resource* resource, UpdateReason reason)
 {
     MemoryCacheEntry* entry = getEntryForResource(resource);
     if (!entry)
         return;
 
     removeFromLiveDecodedResourcesList(entry);
-    if (resource->decodedSize() && resource->hasClientsOrObservers())
+    if (resource->decodedSize() && resource->isAlive())
         insertInLiveDecodedResourcesList(entry);
 
     if (reason != UpdateForAccess)
         return;
 
     double timestamp = resource->isImage() ? m_lastFramePaintTimeStamp : 0.0;
     if (!timestamp)
         timestamp = currentTime();
     entry->m_lastDecodedAccessTime = timestamp;
 }
 
 void MemoryCache::removeURLFromCache(const KURL& url)
 {
     HeapVector<Member<Resource>> resources = resourcesForURL(url);
     for (Resource* resource : resources)
         memoryCache()->remove(resource);
 }
 
 void MemoryCache::TypeStatistic::addResource(Resource* o)
 {
     count++;
     size += o->size();
-    liveSize += o->hasClientsOrObservers() ? o->size() : 0;
+    liveSize += o->isAlive() ? o->size() : 0;
     decodedSize += o->decodedSize();
     encodedSize += o->encodedSize();
     encodedSizeDuplicatedInDataURLs += o->url().protocolIsData() ? o->encodedSize() : 0;
 }
 
 MemoryCache::Statistics MemoryCache::getStatistics()
 {
     Statistics stats;
     for (const auto& resourceMapIter : m_resourceMaps) {
         for (const auto& resourceIter : *resourceMapIter.value) {
@@ skipping 175 matching lines @@
 void MemoryCache::dumpLRULists(bool includeLive) const
 {
     printf("LRU-SP lists in eviction order (Kilobytes decoded, Kilobytes encoded, Access count, Referenced, isPurgeable):\n");
 
     int size = m_allResources.size();
     for (int i = size - 1; i >= 0; i--) {
         printf("\n\nList %d: ", i);
         MemoryCacheEntry* current = m_allResources[i].m_tail;
         while (current) {
             Resource* currentResource = current->resource();
-            if (includeLive || !currentResource->hasClientsOrObservers())
-                printf("(%.1fK, %.1fK, %uA, %dR); ", currentResource->decodedSize() / 1024.0f, (currentResource->encodedSize() + currentResource->overheadSize()) / 1024.0f, current->m_accessCount, currentResource->hasClientsOrObservers());
+            if (includeLive || !currentResource->isAlive())
+                printf("(%.1fK, %.1fK, %uA, %dR); ", currentResource->decodedSize() / 1024.0f, (currentResource->encodedSize() + currentResource->overheadSize()) / 1024.0f, current->m_accessCount, currentResource->isAlive());
 
             current = current->m_previousInAllResourcesList;
         }
     }
 }
 
 #endif // MEMORY_CACHE_STATS
 
 } // namespace blink