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

trunk/Source/core/loader/ResourceLoader.h

 /*
  * Copyright (C) 2005, 2006, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 22 matching lines @@
 #include "core/platform/network/ResourceHandleClient.h"
 #include "core/platform/network/ResourceRequest.h"
 #include "core/platform/network/ResourceResponse.h"
 
 #include "wtf/Forward.h"
 #include "wtf/RefCounted.h"
 
 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; }
     
     void setDefersLoading(bool);
     bool defersLoading() const { return m_defersLoading; }
 
     void releaseResources();
 
     void didChangePriority(ResourceLoadPriority);
 
     // ResourceHandleClient
     virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse& redirectResponse) OVERRIDE;
     virtual void didSendData(ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
     virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE;
     virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength) OVERRIDE;
     virtual void didReceiveCachedMetadata(ResourceHandle*, const char* data, int length) OVERRIDE;
     virtual void didFinishLoading(ResourceHandle*, double finishTime) OVERRIDE;
     virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
     virtual void didDownloadData(ResourceHandle*, int) OVERRIDE;
 
     const KURL& url() const { return m_request.url(); } 
     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();
 
     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.
 
     bool m_loadingMultipartContent;
     bool m_notifiedLoadComplete;
 
     bool m_defersLoading;
     ResourceRequest m_deferredRequest;
     ResourceLoaderOptions m_options;
 
     enum ResourceLoaderState {
         Uninitialized,
         Initialized,
         Finishing,
         Terminated
     };
 
     class RequestCountTracker {
     public:
-        RequestCountTracker(ResourceLoaderHost*, CachedResource*);
+        RequestCountTracker(CachedResourceLoader*, CachedResource*);
         ~RequestCountTracker();
     private:
-        ResourceLoaderHost* m_host;
+        CachedResourceLoader* m_cachedResourceLoader;
         CachedResource* m_resource;
     };
 
     CachedResource* m_resource;
     ResourceLoaderState m_state;
     OwnPtr<RequestCountTracker> m_requestCountTracker;
 };
 
 }
 
 #endif