| Index: Source/core/fetch/ResourceLoader.h
|
| diff --git a/Source/core/fetch/ResourceLoader.h b/Source/core/fetch/ResourceLoader.h
|
| index 6e089deeb064c1e3dd543be7418ec555a40f2f15..6f67699396a9563da91ffc926ad6134ca5dacdf0 100644
|
| --- a/Source/core/fetch/ResourceLoader.h
|
| +++ b/Source/core/fetch/ResourceLoader.h
|
| @@ -48,10 +48,11 @@ class ResourceError;
|
| class ResourceResponse;
|
| class ResourceLoaderHost;
|
|
|
| -class ResourceLoader FINAL : public RefCounted<ResourceLoader>, protected blink::WebURLLoaderClient {
|
| +class ResourceLoader FINAL : public RefCountedWillBeGarbageCollectedFinalized<ResourceLoader>, protected WebURLLoaderClient {
|
| public:
|
| - static PassRefPtr<ResourceLoader> create(ResourceLoaderHost*, Resource*, const ResourceRequest&, const ResourceLoaderOptions&);
|
| + static PassRefPtrWillBeRawPtr<ResourceLoader> create(ResourceLoaderHost*, Resource*, const ResourceRequest&, const ResourceLoaderOptions&);
|
| virtual ~ResourceLoader();
|
| + void trace(Visitor*);
|
|
|
| void start();
|
| void changeToSynchronous();
|
| @@ -112,7 +113,7 @@ private:
|
| ResourceRequest& applyOptions(ResourceRequest&) const;
|
|
|
| OwnPtr<blink::WebURLLoader> m_loader;
|
| - RefPtrWillBePersistent<ResourceLoaderHost> m_host;
|
| + RefPtrWillBeMember<ResourceLoaderHost> m_host;
|
|
|
| ResourceRequest m_request;
|
| ResourceRequest m_originalRequest; // Before redirects.
|
| @@ -139,7 +140,7 @@ private:
|
| ConnectionStateFailed,
|
| };
|
|
|
| - Resource* m_resource;
|
| + RawPtrWillBeMember<Resource> m_resource;
|
| ResourceLoaderState m_state;
|
|
|
| // Used for sanity checking to make sure we don't experience illegal state
|
|
|