Revert 154452 "Refactoring: Introduce ResouceLoaderHost interfac..."

trunk/Source/core/loader/ResourceLoader.h

Index: trunk/Source/core/loader/ResourceLoader.h
===================================================================
--- trunk/Source/core/loader/ResourceLoader.h	(revision 154456)
+++ trunk/Source/core/loader/ResourceLoader.h	(working copy)
@@ -40,23 +40,25 @@
 namespace WebCore {
 
 class CachedResource;
+class CachedResourceLoader;
 class DocumentLoader;
 class Frame;
 class FrameLoader;
 class KURL;
 class ResourceBuffer;
 class ResourceHandle;
-class ResourceLoaderHost;
 
 class ResourceLoader : public RefCounted<ResourceLoader>, protected ResourceHandleClient {
 public:
-    static PassRefPtr<ResourceLoader> create(ResourceLoaderHost*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&);
+    static PassRefPtr<ResourceLoader> create(DocumentLoader*, 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; }
     
@@ -81,13 +83,13 @@
     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(ResourceLoaderHost*) const;
 
     bool reachedTerminalState() const { return m_state == Terminated; }
+
     const ResourceRequest& request() const { return m_request; }
 
 private:
-    ResourceLoader(ResourceLoaderHost*, CachedResource*, const ResourceLoaderOptions&);
+    ResourceLoader(DocumentLoader*, CachedResource*, ResourceLoaderOptions);
 
     bool init(const ResourceRequest&);
     void start();
@@ -95,7 +97,8 @@
     void didFinishLoadingOnePart(double finishTime);
 
     RefPtr<ResourceHandle> m_handle;
-    RefPtr<ResourceLoaderHost> m_host;
+    RefPtr<Frame> m_frame;
+    RefPtr<DocumentLoader> m_documentLoader;
 
     ResourceRequest m_request;
     ResourceRequest m_originalRequest; // Before redirects.
@@ -116,10 +119,10 @@
 
     class RequestCountTracker {
     public:
-        RequestCountTracker(ResourceLoaderHost*, CachedResource*);
+        RequestCountTracker(CachedResourceLoader*, CachedResource*);
         ~RequestCountTracker();
     private:
-        ResourceLoaderHost* m_host;
+        CachedResourceLoader* m_cachedResourceLoader;
         CachedResource* m_resource;
     };