| 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 d3bd7fe22dd294cb5c2989c455a22d26c4c92c99..be4a3e7c1cb7c24181d18522219f954318d3059c 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
|
| @@ -67,17 +67,17 @@ class ResourceLoaderSet;
|
| // alive past detach if scripts still reference the Document.
|
| class CORE_EXPORT ResourceFetcher : public GarbageCollectedFinalized<ResourceFetcher> {
|
| WTF_MAKE_NONCOPYABLE(ResourceFetcher);
|
| - WILL_BE_USING_PRE_FINALIZER(ResourceFetcher, clearPreloads);
|
| + USING_PRE_FINALIZER(ResourceFetcher, clearPreloads);
|
| public:
|
| static ResourceFetcher* create(FetchContext* context) { return new ResourceFetcher(context); }
|
| virtual ~ResourceFetcher();
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| - PassRefPtrWillBeRawPtr<Resource> requestResource(FetchRequest&, const ResourceFactory&, const SubstituteData& = SubstituteData());
|
| + RawPtr<Resource> requestResource(FetchRequest&, const ResourceFactory&, const SubstituteData& = SubstituteData());
|
|
|
| Resource* cachedResource(const KURL&) const;
|
|
|
| - using DocumentResourceMap = WillBeHeapHashMap<String, WeakPtrWillBeWeakMember<Resource>>;
|
| + using DocumentResourceMap = HeapHashMap<String, WeakMember<Resource>>;
|
| const DocumentResourceMap& allResources() const { return m_documentResources; }
|
|
|
| bool autoLoadImages() const { return m_autoLoadImages; }
|
| @@ -153,7 +153,7 @@ public:
|
| void reloadLoFiImages();
|
|
|
| // This is only exposed for testing purposes.
|
| - WillBeHeapListHashSet<RefPtrWillBeMember<Resource>>* preloads() { return m_preloads.get(); }
|
| + HeapListHashSet<Member<Resource>>* preloads() { return m_preloads.get(); }
|
|
|
| private:
|
| friend class ResourceCacheValidationSuppressor;
|
| @@ -161,7 +161,7 @@ private:
|
| explicit ResourceFetcher(FetchContext*);
|
|
|
| void initializeRevalidation(const FetchRequest&, Resource*);
|
| - PassRefPtrWillBeRawPtr<Resource> createResourceForLoading(FetchRequest&, const String& charset, const ResourceFactory&);
|
| + RawPtr<Resource> createResourceForLoading(FetchRequest&, const String& charset, const ResourceFactory&);
|
| void storeResourceTimingInitiatorInformation(Resource*);
|
| bool scheduleArchiveLoad(Resource*, const ResourceRequest&);
|
| void preCacheData(const FetchRequest&, const ResourceFactory&, const SubstituteData&);
|
| @@ -189,12 +189,12 @@ private:
|
| HashSet<String> m_validatedURLs;
|
| mutable DocumentResourceMap m_documentResources;
|
|
|
| - OwnPtrWillBeMember<WillBeHeapListHashSet<RefPtrWillBeMember<Resource>>> m_preloads;
|
| - RefPtrWillBeMember<MHTMLArchive> m_archive;
|
| + Member<HeapListHashSet<Member<Resource>>> m_preloads;
|
| + Member<MHTMLArchive> m_archive;
|
|
|
| Timer<ResourceFetcher> m_resourceTimingReportTimer;
|
|
|
| - using ResourceTimingInfoMap = WillBeHeapHashMap<RawPtrWillBeMember<Resource>, OwnPtr<ResourceTimingInfo>>;
|
| + using ResourceTimingInfoMap = HeapHashMap<Member<Resource>, OwnPtr<ResourceTimingInfo>>;
|
| ResourceTimingInfoMap m_resourceTimingInfoMap;
|
|
|
| Vector<OwnPtr<ResourceTimingInfo>> m_scheduledResourceTimingReports;
|
|
|