Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(288)

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceLoader.h

Issue 1444413002: Revert of Simplify starting a navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/fetch/ResourceLoader.h
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.h b/third_party/WebKit/Source/core/fetch/ResourceLoader.h
index e0b42dbc20e561a2fccfe12a59de0b60ddd38cde..5077de7a0e1b56e4228e35ca82552263f695d3aa 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.h
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.h
@@ -47,7 +47,7 @@
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();
@@ -59,6 +59,7 @@
void cancelIfNotFinishing();
Resource* cachedResource() { return m_resource; }
+ const ResourceRequest& originalRequest() const { return m_originalRequest; }
void setDefersLoading(bool);
bool defersLoading() const { return m_defersLoading; }
@@ -84,13 +85,14 @@
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);
@@ -103,6 +105,7 @@
Member<ResourceFetcher> m_fetcher;
ResourceRequest m_request;
+ ResourceRequest m_originalRequest; // Before redirects.
bool m_notifiedLoadComplete;
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp ('k') | third_party/WebKit/Source/core/fetch/ResourceLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698