Split header modification out of willSendRequest

third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index e31018cc8d8f4776e0afcfba786ac6152a05a333..a1cab7210e5eb75058a5fa775017af6315d8e121 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -432,6 +432,7 @@ Resource* ResourceFetcher::requestResource(FetchRequest& request, const Resource
     request.mutableResourceRequest().setPriority(request.priority());
     initializeResourceRequest(request.mutableResourceRequest(), factory.type(), request.defer());
     context().willStartLoadingResource(identifier, request.mutableResourceRequest(), factory.type());
+    prepareRequest(identifier, request.mutableResourceRequest(), ResourceResponse(), request.options());
     if (!request.url().isValid())
         return nullptr;
 
@@ -469,8 +470,6 @@ Resource* ResourceFetcher::requestResource(FetchRequest& request, const Resource
 
     updateMemoryCacheStats(resource, policy, request, factory, isStaticData);
 
-    request.mutableResourceRequest().setAllowStoredCredentials(request.options().allowCredentials == AllowStoredCredentials);
-
     switch (policy) {
     case Reload:
         memoryCache()->remove(resource);
@@ -1017,18 +1016,16 @@ bool ResourceFetcher::startLoad(Resource* resource)
         return false;
     }
 
-    ResourceRequest request(resource->resourceRequest());
-    willSendRequest(resource->identifier(), request, ResourceResponse(), resource->options());
-
     ResourceLoader* loader = ResourceLoader::create(this, resource);
     if (resource->shouldBlockLoadEvent())
         m_loaders.add(loader);
     else
         m_nonBlockingLoaders.add(loader);
 
+    context().dispatchWillSendRequest(resource->identifier(), resource->resourceRequest(), ResourceResponse(), resource->options().initiatorInfo);
     storeResourceTimingInitiatorInformation(resource);
     resource->setFetcherSecurityOrigin(context().getSecurityOrigin());
-    loader->start(request, context().loadingTaskRunner(), context().defersLoading());
+    loader->start(resource->resourceRequest(), context().loadingTaskRunner(), context().defersLoading());

[Shao-Chuan Lee, 2016/10/06 03:34:41]

Maybe we can now remove the first param in ResourceLoader::start() and use
m_resource->resourceRequest()?

     return true;
 }
 
@@ -1098,14 +1095,15 @@ bool ResourceFetcher::willFollowRedirect(Resource* resource, ResourceRequest& ne
         bool crossOrigin = !redirectedSecurityOrigin->isSameSchemeHostPort(originalSecurityOrigin.get());
         it->value->addRedirect(redirectResponse, encodedDataLength, crossOrigin);
     }
-    newRequest.setAllowStoredCredentials(resource->options().allowCredentials == AllowStoredCredentials);
-    willSendRequest(resource->identifier(), newRequest, redirectResponse, resource->options());
+    prepareRequest(resource->identifier(), newRequest, redirectResponse, resource->options());
+    context().dispatchWillSendRequest(resource->identifier(), newRequest, redirectResponse, resource->options().initiatorInfo);
     return true;
 }
 
-void ResourceFetcher::willSendRequest(unsigned long identifier, ResourceRequest& newRequest, const ResourceResponse& redirectResponse, const ResourceLoaderOptions& options)
+void ResourceFetcher::prepareRequest(unsigned long identifier, ResourceRequest& newRequest, const ResourceResponse& redirectResponse, const ResourceLoaderOptions& options)
 {
-    context().dispatchWillSendRequest(identifier, newRequest, redirectResponse, options.initiatorInfo);
+    newRequest.setAllowStoredCredentials(options.allowCredentials == AllowStoredCredentials);
+    context().prepareRequest(identifier, newRequest, redirectResponse);
 }
 
 void ResourceFetcher::updateAllImageResourcePriorities()