| Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.h
|
| diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.h b/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
|
| index 992bc497ca0cc6ca90156e083199e1fc66c0a984..5b1eab060e4c1019819d371e719ad612bd63d864 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
|
| @@ -78,7 +78,7 @@ public:
|
|
|
| Resource* cachedResource(const KURL&) const;
|
|
|
| - typedef HashMap<String, ResourcePtr<Resource>> DocumentResourceMap;
|
| + typedef WillBeHeapHashMap<String, WeakPtrWillBeWeakMember<Resource>> DocumentResourceMap;
|
| const DocumentResourceMap& allResources() const { return m_documentResources; }
|
|
|
| bool autoLoadImages() const { return m_autoLoadImages; }
|
| @@ -91,8 +91,6 @@ public:
|
| FetchContext& context() const { return m_context ? *m_context.get() : FetchContext::nullInstance(); }
|
| void clearContext() { m_context.clear(); }
|
|
|
| - void garbageCollectDocumentResources();
|
| -
|
| int requestCount() const;
|
|
|
| bool isPreloaded(const KURL&) const;
|
| @@ -174,8 +172,6 @@ private:
|
|
|
| static bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);
|
|
|
| - void garbageCollectDocumentResourcesTimerFired(Timer<ResourceFetcher>*);
|
| -
|
| void resourceTimingReportTimerFired(Timer<ResourceFetcher>*);
|
|
|
| void reloadImagesIfNotDeferred();
|
| @@ -197,7 +193,6 @@ private:
|
| OwnPtrWillBeMember<WillBeHeapListHashSet<RawPtrWillBeMember<Resource>>> m_preloads;
|
| OwnPtrWillBeMember<ArchiveResourceCollection> m_archiveResourceCollection;
|
|
|
| - Timer<ResourceFetcher> m_garbageCollectDocumentResourcesTimer;
|
| Timer<ResourceFetcher> m_resourceTimingReportTimer;
|
|
|
| // We intentionally use a Member instead of a ResourcePtr.
|
|
|