Revert 148069 and 148060 to see if they were responsible for a perf regression

Source/WebCore/loader/ResourceLoader.h

Index: Source/WebCore/loader/ResourceLoader.h
diff --git a/Source/WebCore/loader/ResourceLoader.h b/Source/WebCore/loader/ResourceLoader.h
index 45a69b507d2439da3c7d4b67828d59347d43837a..848ce1a6e08e517b6a2989cd836a8369267ed154 100644
--- a/Source/WebCore/loader/ResourceLoader.h
+++ b/Source/WebCore/loader/ResourceLoader.h
@@ -51,13 +51,16 @@ class ResourceHandle;
 
 class ResourceLoader : public RefCounted<ResourceLoader>, protected ResourceHandleClient {
 public:
-    static PassRefPtr<ResourceLoader> create(Frame*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&);
     virtual ~ResourceLoader();
 
     void cancel();
     void cancel(const ResourceError&);
     void cancelIfNotFinishing();
 
+    virtual bool init(const ResourceRequest&);
+
+    void start();
+
     FrameLoader* frameLoader() const;
     DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
     CachedResource* cachedResource() { return m_resource; }
@@ -66,27 +69,35 @@ public:
     ResourceError cancelledError();
     ResourceError cannotShowURLError();
     
-    void setDefersLoading(bool);
+    virtual void setDefersLoading(bool);
     bool defersLoading() const { return m_defersLoading; }
 
     unsigned long identifier() const { return m_identifier; }
 
-    void releaseResources();
+    virtual void releaseResources();
+    const ResourceResponse& response() const;
 
     PassRefPtr<ResourceBuffer> resourceData();
     void clearResourceData();
-
+    
+    virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
+    virtual void didReceiveResponse(const ResourceResponse&);
+    virtual void didReceiveCachedMetadata(const char*, int) { }
+    virtual void didFinishLoading(double finishTime);
+    virtual void didFail(const ResourceError&);
     void didChangePriority(ResourceLoadPriority);
 
+    virtual bool shouldUseCredentialStorage();
+
     // 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 didReceiveCachedMetadata(ResourceHandle*, const char* data, int length) OVERRIDE { didReceiveCachedMetadata(data, length); }
     virtual void didFinishLoading(ResourceHandle*, double finishTime) OVERRIDE;
     virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
-    virtual bool shouldUseCredentialStorage(ResourceHandle*) OVERRIDE;
+    virtual bool shouldUseCredentialStorage(ResourceHandle*) OVERRIDE { return shouldUseCredentialStorage(); }
     virtual void didDownloadData(ResourceHandle*, int) OVERRIDE;
 
     const KURL& url() const { return m_request.url(); } 
@@ -103,12 +114,9 @@ public:
 
     void reportMemoryUsage(MemoryObjectInfo*) const;
 
-private:
+protected:
     ResourceLoader(Frame*, CachedResource*, ResourceLoaderOptions);
 
-    bool init(const ResourceRequest&);
-    void start();
-
     void didFinishLoadingOnePart(double finishTime);
 
     bool cancelled() const { return m_cancelled; }
@@ -118,6 +126,7 @@ private:
     RefPtr<ResourceHandle> m_handle;
     RefPtr<Frame> m_frame;
     RefPtr<DocumentLoader> m_documentLoader;
+    ResourceResponse m_response;
 
     void addData(const char*, int);
 
@@ -156,6 +165,11 @@ private:
     OwnPtr<RequestCountTracker> m_requestCountTracker;
 };
 
+inline const ResourceResponse& ResourceLoader::response() const
+{
+    return m_response;
+}
+
 }
 
 #endif