[Oilpan] [Reland] Migrate classes under core/fetch to Oilpan heap

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 20 matching lines @@
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/MainThread.h"
 #include "wtf/MathExtras.h"
 #include "wtf/TemporaryChange.h"
 #include "wtf/text/CString.h"
 
 namespace blink {
 
-static OwnPtrWillBePersistent<MemoryCache>* gMemoryCache;
+static Persistent<MemoryCache>* gMemoryCache;
 
 static const unsigned cDefaultCacheCapacity = 8192 * 1024;
 static const unsigned cDeferredPruneDeadCapacityFactor = 2;
 static const int cMinDelayBeforeLiveDecodedPrune = 1; // Seconds.
 static const double cMaxPruneDeferralDelay = 0.5; // Seconds.
 static const float cTargetPrunePercentage = .95f; // Percentage of capacity toward which we prune, to avoid immediately pruning again.
 
 MemoryCache* memoryCache()
 {
     ASSERT(WTF::isMainThread());
     if (!gMemoryCache)
-        gMemoryCache = new OwnPtrWillBePersistent<MemoryCache>(MemoryCache::create());
+        gMemoryCache = new Persistent<MemoryCache>(MemoryCache::create());
     return gMemoryCache->get();
 }
 
-PassOwnPtrWillBeRawPtr<MemoryCache> replaceMemoryCacheForTesting(PassOwnPtrWillBeRawPtr<MemoryCache> cache)
+MemoryCache* replaceMemoryCacheForTesting(MemoryCache* cache)
 {
 #if ENABLE(OILPAN)
     // Move m_liveResources content to keep Resource objects alive.
     for (const auto& resource : memoryCache()->m_liveResources)
         cache->m_liveResources.add(resource);
     memoryCache()->m_liveResources.clear();
-#else
-    // Make sure we have non-empty gMemoryCache.
+#endif
     memoryCache();
-#endif
-    OwnPtrWillBeRawPtr<MemoryCache> oldCache = gMemoryCache->release();
+    MemoryCache* oldCache = gMemoryCache->release();
     *gMemoryCache = cache;
-    return oldCache.release();
+    return oldCache;
 }
 
 DEFINE_TRACE(MemoryCacheEntry)
 {
     visitor->trace(m_previousInLiveResourcesList);
     visitor->trace(m_nextInLiveResourcesList);
     visitor->trace(m_previousInAllResourcesList);
     visitor->trace(m_nextInAllResourcesList);
 }
 
-#if ENABLE(OILPAN)
 void MemoryCacheEntry::dispose()
 {
     m_resource.clear();
 }
-#endif
 
 DEFINE_TRACE(MemoryCacheLRUList)
 {
     visitor->trace(m_head);
     visitor->trace(m_tail);
 }
 
 inline MemoryCache::MemoryCache()
     : m_inPruneResources(false)
     , m_prunePending(false)
@@ skipping 11 matching lines @@
 #ifdef MEMORY_CACHE_STATS
     , m_statsTimer(this, &MemoryCache::dumpStats)
 #endif
 {
 #ifdef MEMORY_CACHE_STATS
     const double statsIntervalInSeconds = 15;
     m_statsTimer.startRepeating(statsIntervalInSeconds, FROM_HERE);
 #endif
 }
 
-PassOwnPtrWillBeRawPtr<MemoryCache> MemoryCache::create()
+MemoryCache* MemoryCache::create()
 {
-    return adoptPtrWillBeNoop(new MemoryCache());
+    return new MemoryCache;
 }
 
 MemoryCache::~MemoryCache()
 {
     if (m_prunePending)
         Platform::current()->currentThread()->removeTaskObserver(this);
 }
 
 DEFINE_TRACE(MemoryCache)
 {
-#if ENABLE(OILPAN)
     visitor->trace(m_allResources);
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(m_liveDecodedResources); ++i)
         visitor->trace(m_liveDecodedResources[i]);
     visitor->trace(m_resourceMaps);
+#if ENABLE(OILPAN)
     visitor->trace(m_liveResources);
 #endif
 }
 
 KURL MemoryCache::removeFragmentIdentifierIfNeeded(const KURL& originalURL)
 {
     if (!originalURL.hasFragmentIdentifier())
         return originalURL;
     // Strip away fragment identifier from HTTP URLs.
     // Data URLs must be unmodified. For file and custom URLs clients may expect resources
     // to be unique even when they differ by the fragment identifier only.
     if (!originalURL.protocolIsInHTTPFamily())
         return originalURL;
     KURL url = originalURL;
     url.removeFragmentIdentifier();
     return url;
 }
 
 String MemoryCache::defaultCacheIdentifier()
 {
     return emptyString();
 }
 
 MemoryCache::ResourceMap* MemoryCache::ensureResourceMap(const String& cacheIdentifier)
 {
     if (!m_resourceMaps.contains(cacheIdentifier)) {
-        ResourceMapIndex::AddResult result = m_resourceMaps.add(cacheIdentifier, adoptPtrWillBeNoop(new ResourceMap()));
+        ResourceMapIndex::AddResult result = m_resourceMaps.add(cacheIdentifier, new ResourceMap());
         RELEASE_ASSERT(result.isNewEntry);
     }
     return m_resourceMaps.get(cacheIdentifier);
 }
 
 void MemoryCache::add(Resource* resource)
 {
     ASSERT(WTF::isMainThread());
     ASSERT(resource->url().isValid());
     ResourceMap* resources = ensureResourceMap(resource->cacheIdentifier());
@@ skipping 236 matching lines @@
     WTF_LOG(ResourceLoading, "Evicting resource %p for '%s' from cache", resource, resource->url().string().latin1().data());
     // The resource may have already been removed by someone other than our caller,
     // who needed a fresh copy for a reload. See <http://bugs.webkit.org/show_bug.cgi?id=12479#c6>.
     update(resource, resource->size(), 0, false);
     removeFromLiveDecodedResourcesList(entry);
 
     ResourceMap* resources = m_resourceMaps.get(resource->cacheIdentifier());
     ASSERT(resources);
     ResourceMap::iterator it = resources->find(resource->url());
     ASSERT(it != resources->end());
-#if ENABLE(OILPAN)
+
     MemoryCacheEntry* entryPtr = it->value;
-#else
-    OwnPtr<MemoryCacheEntry> entryPtr;
-    entryPtr.swap(it->value);
-#endif
     resources->remove(it);
-#if ENABLE(OILPAN)
     if (entryPtr)
         entryPtr->dispose();
-#endif
+
     return canDelete;
 }
 
 MemoryCacheEntry* MemoryCache::getEntryForResource(const Resource* resource) const
 {
     if (resource->url().isNull() || resource->url().isEmpty())
         return nullptr;
     ResourceMap* resources = m_resourceMaps.get(resource->cacheIdentifier());
     if (!resources)
         return nullptr;
@@ skipping 342 matching lines @@
     pruneLiveResources(strategy);
     m_pruneFrameTimeStamp = m_lastFramePaintTimeStamp;
     m_pruneTimeStamp = currentTime;
 }
 
 void MemoryCache::updateFramePaintTimestamp()
 {
     m_lastFramePaintTimeStamp = currentTime();
 }
 
-#if ENABLE(OILPAN)
 void MemoryCache::registerLiveResource(Resource& resource)
 {
+#if ENABLE(OILPAN)
     ASSERT(!m_liveResources.contains(&resource));
     m_liveResources.add(&resource);
+#endif
 }
 
 void MemoryCache::unregisterLiveResource(Resource& resource)
 {
+#if ENABLE(OILPAN)
     ASSERT(m_liveResources.contains(&resource));
     m_liveResources.remove(&resource);
+#endif
 }
 
-#else
-
-void MemoryCache::registerLiveResource(Resource&)
-{
-}
-
-void MemoryCache::unregisterLiveResource(Resource&)
-{
-}
-#endif
-
 #ifdef MEMORY_CACHE_STATS
 
 void MemoryCache::dumpStats(Timer<MemoryCache>*)
 {
     Statistics s = getStatistics();
     printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s\n", "", "Count", "Size", "LiveSize", "DecodedSize", "PurgeableSize", "PurgedSize");
     printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s\n", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------");
     printf("%-13s %13d %13d %13d %13d %13d %13d\n", "Images", s.images.count, s.images.size, s.images.liveSize, s.images.decodedSize, s.images.purgeableSize, s.images.purgedSize);
     printf("%-13s %13d %13d %13d %13d %13d %13d\n", "CSS", s.cssStyleSheets.count, s.cssStyleSheets.size, s.cssStyleSheets.liveSize, s.cssStyleSheets.decodedSize, s.cssStyleSheets.purgeableSize, s.cssStyleSheets.purgedSize);
     printf("%-13s %13d %13d %13d %13d %13d %13d\n", "XSL", s.xslStyleSheets.count, s.xslStyleSheets.size, s.xslStyleSheets.liveSize, s.xslStyleSheets.decodedSize, s.xslStyleSheets.purgeableSize, s.xslStyleSheets.purgedSize);
@@ skipping 25 matching lines @@
                 printf("(%.1fK, %.1fK, %uA, %dR, %d, %d); ", currentResource->decodedSize() / 1024.0f, (currentResource->encodedSize() + currentResource->overheadSize()) / 1024.0f, current->m_accessCount, currentResource->hasClients(), currentResource->isPurgeable(), currentResource->wasPurged());
 
             current = current->m_previousInAllResourcesList;
         }
     }
 }
 
 #endif // MEMORY_CACHE_STATS
 
 } // namespace blink