Don't duplicate ResourceRequests and ResourceLoaderOptions on ResourceLoader

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 27 matching lines @@
 #include "wtf/RefCounted.h"
 
 namespace blink {
 
 class Resource;
 class ResourceError;
 class ResourceFetcher;
 
 class CORE_EXPORT ResourceLoader final : public GarbageCollectedFinalized<ResourceLoader>, protected WebURLLoaderClient {
 public:
-    static ResourceLoader* create(ResourceFetcher*, Resource*, const ResourceRequest&, const ResourceLoaderOptions&);
+    static ResourceLoader* create(ResourceFetcher*, Resource*);
     ~ResourceLoader() override;
     DECLARE_TRACE();
 
     // Promptly release m_loader.
     EAGERLY_FINALIZE();
 
-    void start();
-    void changeToSynchronous();
+    void start(ResourceRequest&);
 
     void cancel();
     void cancel(const ResourceError&);
     void cancelIfNotFinishing();
 
     Resource* cachedResource() { return m_resource.get(); }
-    const ResourceRequest& originalRequest() const { return m_originalRequest; }
 
     void setDefersLoading(bool);
 
     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;
 
     bool loadingMultipartContent() const { return m_loadingMultipartContent; }
 
 private:
     // Assumes ResourceFetcher and Resource are non-null.
-    ResourceLoader(ResourceFetcher*, Resource*, const ResourceLoaderOptions&);
+    ResourceLoader(ResourceFetcher*, Resource*);
 
-    void init(const ResourceRequest&);
-    void requestSynchronously();
+    void requestSynchronously(ResourceRequest&);
 
     void didFinishLoadingOnePart(double finishTime, int64_t encodedDataLength);
 
     bool responseNeedsAccessControlCheck() const;
 
     ResourceRequest& applyOptions(ResourceRequest&) const;
 
     void releaseResources();
 
     OwnPtr<WebURLLoader> m_loader;
     Member<ResourceFetcher> m_fetcher;
 
-    ResourceRequest m_request;
-    ResourceRequest m_originalRequest; // Before redirects.
-
     bool m_notifiedLoadComplete;
 
     bool m_loadingMultipartContent;
-    ResourceLoaderOptions m_options;
 
     enum ConnectionState {
         ConnectionStateNew,
         ConnectionStateStarted,
         ConnectionStateReceivedResponse,
         ConnectionStateReceivingData,
         ConnectionStateFinishedLoading,
         ConnectionStateCanceled,
         ConnectionStateFailed,
         ConnectionStateReleased
     };
     bool isFinishing() { return m_state >= ConnectionStateFinishedLoading && m_state <= ConnectionStateFailed; }
 
     RefPtrWillBeMember<Resource> m_resource;
 
     // Used for sanity checking to make sure we don't experience illegal state
     // transitions.
     ConnectionState m_state;
 };
 
 } // namespace blink
 
 #endif