Refactoring starting a resource load

third_party/WebKit/Source/core/fetch/Resource.h

Index: third_party/WebKit/Source/core/fetch/Resource.h
diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
index 37a5c9f68a7584bba45e7ec5cb3b7a43f7b30e70..5ef4da3dca9079faa1959a708607130e9f254726 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.h
+++ b/third_party/WebKit/Source/core/fetch/Resource.h
@@ -46,7 +46,6 @@ struct FetchInitiatorInfo;
 class CachedMetadata;
 class FetchRequest;
 class ResourceClient;
-class ResourceFetcher;
 class ResourceTimingInfo;
 class ResourceLoader;
 class SecurityOrigin;
@@ -94,8 +93,6 @@ public:
     void willDestroyResource();
     DECLARE_VIRTUAL_TRACE();
 
-    void load(ResourceFetcher*);
-
     virtual void setEncoding(const String&) { }
     virtual String encoding() const { return String(); }
     virtual void appendData(const char*, size_t);
@@ -114,11 +111,14 @@ public:
 
     virtual bool shouldIgnoreHTTPStatusCodeErrors() const { return false; }
 
+    const ResourceRequest& requestForLoadStart() const { return m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest; }
     const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
     const ResourceRequest& lastResourceRequest() const;
 
     virtual void setRevalidatingRequest(const ResourceRequest&);
 
+    void setFetcherSecurityOrigin(SecurityOrigin* origin) { m_fetcherSecurityOrigin = origin; }
+
     // This url can have a fragment, but it can match resources that differ by the fragment only.
     const KURL& url() const { return m_resourceRequest.url();}
     Type getType() const { return static_cast<Type>(m_type); }
@@ -155,6 +155,7 @@ public:
     bool isLoading() const { return m_status == Pending; }
     bool stillNeedsLoad() const { return m_status < Pending; }
 
+    void setLoader(ResourceLoader*);
     ResourceLoader* loader() const { return m_loader.get(); }
 
     virtual bool isImage() const { return false; }