Revert of Simplify starting a navigation

third_party/WebKit/Source/core/fetch/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 29 matching lines @@
 namespace blink {
 
 class Resource;
 class KURL;
 class ResourceError;
 class ResourceFetcher;
 class ThreadedDataReceiver;
 
 class CORE_EXPORT ResourceLoader final : public GarbageCollectedFinalized<ResourceLoader>, protected WebURLLoaderClient {
 public:
-    static ResourceLoader* create(ResourceFetcher*, Resource*, ResourceRequest&, const ResourceLoaderOptions&);
+    static ResourceLoader* create(ResourceFetcher*, Resource*, const ResourceRequest&, const ResourceLoaderOptions&);
     ~ResourceLoader() override;
     DECLARE_TRACE();
 
     void start();
     void changeToSynchronous();
 
     void cancel();
     void cancel(const ResourceError&);
     void cancelIfNotFinishing();
 
     Resource* cachedResource() { return m_resource; }
+    const ResourceRequest& originalRequest() const { return m_originalRequest; }
 
     void setDefersLoading(bool);
     bool defersLoading() const { return m_defersLoading; }
 
     void attachThreadedDataReceiver(PassRefPtrWillBeRawPtr<ThreadedDataReceiver>);
 
     void releaseResources();
 
     void didChangePriority(ResourceLoadPriority, int intraPriorityValue);
 
     // WebURLLoaderClient
     void willFollowRedirect(WebURLLoader*, WebURLRequest&, const WebURLResponse& redirectResponse) override;
     void didSendData(WebURLLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
     void didReceiveResponse(WebURLLoader*, const WebURLResponse&) override;
     void didReceiveResponse(WebURLLoader*, const WebURLResponse&, WebDataConsumerHandle*) override;
     void didReceiveData(WebURLLoader*, const char*, int, int encodedDataLength) override;
     void didReceiveCachedMetadata(WebURLLoader*, const char* data, int length) override;
     void didFinishLoading(WebURLLoader*, double finishTime, int64_t encodedDataLength) override;
     void didFail(WebURLLoader*, const WebURLError&) override;
     void didDownloadData(WebURLLoader*, int, int) override;
 
     const KURL& url() const { return m_request.url(); }
     bool isLoadedBy(ResourceFetcher*) const;
 
     bool reachedTerminalState() const { return m_state == Terminated; }
+    const ResourceRequest& request() const { return m_request; }
 
     bool loadingMultipartContent() const { return m_loadingMultipartContent; }
 
 private:
     ResourceLoader(ResourceFetcher*, Resource*, const ResourceLoaderOptions&);
 
-    void init(ResourceRequest&);
+    void init(const ResourceRequest&);
     void requestSynchronously();
 
     void didFinishLoadingOnePart(double finishTime, int64_t encodedDataLength);
 
     bool responseNeedsAccessControlCheck() const;
 
     ResourceRequest& applyOptions(ResourceRequest&) const;
 
     OwnPtr<WebURLLoader> m_loader;
     Member<ResourceFetcher> m_fetcher;
 
     ResourceRequest m_request;
+    ResourceRequest m_originalRequest; // Before redirects.
 
     bool m_notifiedLoadComplete;
 
     bool m_defersLoading;
     bool m_loadingMultipartContent;
     ResourceRequest m_deferredRequest;
     ResourceLoaderOptions m_options;
 
     enum ResourceLoaderState {
         Initialized,
@@ skipping 15 matching lines @@
     ResourceLoaderState m_state;
 
     // Used for sanity checking to make sure we don't experience illegal state
     // transitions.
     ConnectionState m_connectionState;
 };
 
 }
 
 #endif