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

Source/WebCore/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 33 matching lines @@
 class CachedResourceLoader;
 class DocumentLoader;
 class Frame;
 class FrameLoader;
 class KURL;
 class ResourceBuffer;
 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; }
     const ResourceRequest& originalRequest() const { return m_originalRequest; }
 
     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);
 
-    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(); } 
     ResourceHandle* handle() const { return m_handle.get(); }
     bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
     void setSendCallbackPolicy(SendCallbackPolicy sendLoadCallbacks) { m_options.sendLoadCallbacks = sendLoadCallbacks; }
     bool shouldSniffContent() const { return m_options.sniffContent == SniffContent; }
 
     bool reachedTerminalState() const { return m_reachedTerminalState; }
 
     const ResourceRequest& request() const { return m_request; }
 
     void setDataBufferingPolicy(DataBufferingPolicy);
 
     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; }
 
     void sendDataToResource(const char*, int);
 
     RefPtr<ResourceHandle> m_handle;
     RefPtr<Frame> m_frame;
     RefPtr<DocumentLoader> m_documentLoader;
+    ResourceResponse m_response;
 
     void addData(const char*, int);
 
     ResourceRequest m_request;
     ResourceRequest m_originalRequest; // Before redirects.
     RefPtr<ResourceBuffer> m_resourceData;
     
     unsigned long m_identifier;
 
     bool m_loadingMultipartContent;
@@ skipping 18 matching lines @@
     private:
         CachedResourceLoader* m_cachedResourceLoader;
         CachedResource* m_resource;
     };
 
     CachedResource* m_resource;
     ResourceLoaderState m_state;
     OwnPtr<RequestCountTracker> m_requestCountTracker;
 };
 
+inline const ResourceResponse& ResourceLoader::response() const
+{
+    return m_response;
+}
+
 }
 
 #endif