| Index: Source/core/loader/ResourceLoader.h
|
| diff --git a/Source/core/loader/ResourceLoader.h b/Source/core/loader/ResourceLoader.h
|
| index 9582dac9b0995dc29cebfcd8d8abc50f4a45b655..c1459d748d072c02d1a9400ae82f146031bb9f58 100644
|
| --- a/Source/core/loader/ResourceLoader.h
|
| +++ b/Source/core/loader/ResourceLoader.h
|
| @@ -47,18 +47,17 @@ class FrameLoader;
|
| class KURL;
|
| class ResourceBuffer;
|
| class ResourceHandle;
|
| +class ResourceLoaderHost;
|
|
|
| class ResourceLoader : public RefCounted<ResourceLoader>, protected ResourceHandleClient {
|
| public:
|
| - static PassRefPtr<ResourceLoader> create(DocumentLoader*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&);
|
| + static PassRefPtr<ResourceLoader> create(ResourceLoaderHost*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&);
|
| virtual ~ResourceLoader();
|
|
|
| void cancel();
|
| void cancel(const ResourceError&);
|
| void cancelIfNotFinishing();
|
|
|
| - FrameLoader* frameLoader() const;
|
| - DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
|
| CachedResource* cachedResource() { return m_resource; }
|
| const ResourceRequest& originalRequest() const { return m_originalRequest; }
|
|
|
| @@ -86,15 +85,15 @@ public:
|
| ResourceHandle* handle() const { return m_handle.get(); }
|
| bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
|
| bool shouldSniffContent() const { return m_options.sniffContent == SniffContent; }
|
| + bool isLoadedBy(CachedResourceLoader*) const;
|
|
|
| bool reachedTerminalState() const { return m_state == Terminated; }
|
| -
|
| const ResourceRequest& request() const { return m_request; }
|
|
|
| void reportMemoryUsage(MemoryObjectInfo*) const;
|
|
|
| private:
|
| - ResourceLoader(DocumentLoader*, CachedResource*, ResourceLoaderOptions);
|
| + ResourceLoader(ResourceLoaderHost*, CachedResource*, const ResourceLoaderOptions&);
|
|
|
| bool init(const ResourceRequest&);
|
| void start();
|
| @@ -102,8 +101,7 @@ private:
|
| void didFinishLoadingOnePart(double finishTime);
|
|
|
| RefPtr<ResourceHandle> m_handle;
|
| - RefPtr<Frame> m_frame;
|
| - RefPtr<DocumentLoader> m_documentLoader;
|
| + RefPtr<ResourceLoaderHost> m_host;
|
|
|
| ResourceRequest m_request;
|
| ResourceRequest m_originalRequest; // Before redirects.
|
| @@ -124,10 +122,10 @@ private:
|
|
|
| class RequestCountTracker {
|
| public:
|
| - RequestCountTracker(CachedResourceLoader*, CachedResource*);
|
| + RequestCountTracker(ResourceLoaderHost*, CachedResource*);
|
| ~RequestCountTracker();
|
| private:
|
| - CachedResourceLoader* m_cachedResourceLoader;
|
| + ResourceLoaderHost* m_host;
|
| CachedResource* m_resource;
|
| };
|
|
|
|
|