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

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

Issue 1418003006: Simplify starting a navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enum-ify 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.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
index 6107296e428e20e3d55e334972bed1aba0f37b12..a549bf6f92b6c0378965ddbf3d9873d8d4a42c01 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
@@ -51,7 +51,7 @@
namespace blink {
-ResourceLoader* ResourceLoader::create(ResourceFetcher* fetcher, Resource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
+ResourceLoader* ResourceLoader::create(ResourceFetcher* fetcher, Resource* resource, ResourceRequest& request, const ResourceLoaderOptions& options)
{
ResourceLoader* loader = new ResourceLoader(fetcher, resource, options);
loader->init(request);
@@ -103,15 +103,13 @@ void ResourceLoader::releaseResources()
m_fetcher.clear();
}
-void ResourceLoader::init(const ResourceRequest& passedRequest)
+void ResourceLoader::init(ResourceRequest& request)
{
ASSERT(m_state != Terminated);
- ResourceRequest request(passedRequest);
m_fetcher->willSendRequest(m_resource->identifier(), request, ResourceResponse(), m_options.initiatorInfo);
ASSERT(m_state != Terminated);
ASSERT(!request.isNull());
- m_originalRequest = m_request = applyOptions(request);
- m_resource->updateRequest(request);
+ m_request = applyOptions(request);
ASSERT(m_state != Terminated);
m_fetcher->didInitializeResourceLoader(this);
}
@@ -276,15 +274,10 @@ void ResourceLoader::willFollowRedirect(WebURLLoader*, WebURLRequest& passedNewR
applyOptions(newRequest); // canAccessRedirect() can modify m_options so we should re-apply it.
m_fetcher->redirectReceived(m_resource, redirectResponse);
- ASSERT(m_state != Terminated);
+ m_fetcher->willSendRequest(m_resource->identifier(), newRequest, redirectResponse, m_options.initiatorInfo);
m_resource->willFollowRedirect(newRequest, redirectResponse);
if (newRequest.isNull() || m_state == Terminated)
return;
-
- m_fetcher->willSendRequest(m_resource->identifier(), newRequest, redirectResponse, m_options.initiatorInfo);
- ASSERT(m_state != Terminated);
- ASSERT(!newRequest.isNull());
- m_resource->updateRequest(newRequest);
m_request = newRequest;
}
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceLoader.h ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698