Oilpan: Prepare to move ResourceLoader and ResourceLoaderSet to Oilpan heap.

Source/core/fetch/ResourceFetcher.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     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 194 matching lines @@
     HashSet<String> m_validatedURLs;
     mutable DocumentResourceMap m_documentResources;
     // FIXME: Oilpan: Ideally this should just be a traced Member but that will
     // currently leak because RenderStyle and its data are not on the heap.
     // See crbug.com/383860 for details.
     RawPtrWillBeWeakMember<Document> m_document;
     DocumentLoader* m_documentLoader;
 
     int m_requestCount;
 
     OwnPtr<ListHashSet<Resource*> > m_preloads;

[haraken, 2014/07/29 10:30:17]

Consider using HeapListHashSet in a follow-up. (Actually I'm not sure why it's
safe to touch m_preloads in ResourceFetcher's destructor.)

 
     Timer<ResourceFetcher> m_garbageCollectDocumentResourcesTimer;
     Timer<ResourceFetcher> m_resourceTimingReportTimer;
 
     typedef HashMap<Resource*, RefPtr<ResourceTimingInfo> > ResourceTimingInfoMap;

[haraken, 2014/07/29 10:30:17]

Consider using HeapHashMap in a follow-up.

     ResourceTimingInfoMap m_resourceTimingInfoMap;
 
     HashMap<RefPtr<ResourceTimingInfo>, bool> m_scheduledResourceTimingReports;
 
-    OwnPtr<ResourceLoaderSet> m_loaders;
-    OwnPtr<ResourceLoaderSet> m_multipartLoaders;
+    OwnPtrWillBeMember<ResourceLoaderSet> m_loaders;
+    OwnPtrWillBeMember<ResourceLoaderSet> m_multipartLoaders;
 
     // Used in hit rate histograms.
     class DeadResourceStatsRecorder {
     public:
         DeadResourceStatsRecorder();
         ~DeadResourceStatsRecorder();
 
         void update(RevalidationPolicy);
 
     private:
         int m_useCount;
         int m_revalidateCount;
         int m_loadCount;
     };
     DeadResourceStatsRecorder m_deadStatsRecorder;
 
     // 29 bits left
     bool m_autoLoadImages : 1;
     bool m_imagesEnabled : 1;
     bool m_allowStaleResources : 1;
 };
 
 class ResourceCacheValidationSuppressor {

[haraken, 2014/07/29 10:30:17]

Consider moving this to the heap in a follow-up.

     WTF_MAKE_NONCOPYABLE(ResourceCacheValidationSuppressor);
     WTF_MAKE_FAST_ALLOCATED;
 public:
     ResourceCacheValidationSuppressor(ResourceFetcher* loader)
         : m_loader(loader)
         , m_previousState(false)
     {
         if (m_loader) {
             m_previousState = m_loader->m_allowStaleResources;
             m_loader->m_allowStaleResources = true;
         }
     }
     ~ResourceCacheValidationSuppressor()
     {
         if (m_loader)
             m_loader->m_allowStaleResources = m_previousState;
     }
 private:
     ResourceFetcher* m_loader;
     bool m_previousState;
 };
 
 } // namespace blink
 
 #endif