Split header modification out of willSendRequest

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 487 matching lines @@
     DCHECK(!substituteData.forceSynchronousLoad());
     return Block;
   }
 
   context().willStartLoadingResource(
       identifier, resourceRequest, factory.type(),
       request.options().initiatorInfo.name,
       (request.isSpeculativePreload()
            ? FetchContext::V8ActivityLoggingPolicy::SuppressLogging
            : FetchContext::V8ActivityLoggingPolicy::Log));
-  if (!request.url().isValid())
-    return Abort;
 
   // Resource requests from suborigins should not be intercepted by the service
   // worker of the physical origin. This has the effect that, for now,
   // suborigins do not work with service workers. See
   // https://w3c.github.io/webappsec-suborigins/.
   SecurityOrigin* sourceOrigin = context().getSecurityOrigin();
   if (sourceOrigin && sourceOrigin->hasSuborigin()) {
     resourceRequest.setServiceWorkerMode(
         WebURLRequest::ServiceWorkerMode::None);
   }
 
   resourceRequest.setAllowStoredCredentials(
       request.options().allowCredentials == AllowStoredCredentials);
+  context().prepareRequest(identifier, resourceRequest);
+
+  if (!request.url().isValid())
+    return Abort;
+
   return Continue;
 }
 
 Resource* ResourceFetcher::requestResource(
     FetchRequest& request,
     const ResourceFactory& factory,
     const SubstituteData& substituteData) {
   unsigned long identifier = createUniqueIdentifier();
   ResourceRequest& resourceRequest = request.mutableResourceRequest();
   network_instrumentation::ScopedResourceLoadTracker scopedResourceLoadTracker(
@@ skipping 709 matching lines @@
 }
 
 bool ResourceFetcher::startLoad(Resource* resource) {
   DCHECK(resource);
   DCHECK(resource->stillNeedsLoad());
   if (!context().shouldLoadNewResource(resource->getType())) {
     memoryCache()->remove(resource);
     return false;
   }
 
-  ResourceRequest request(resource->resourceRequest());
-  context().dispatchWillSendRequest(resource->identifier(), request,
-                                    ResourceResponse(),
-                                    resource->options().initiatorInfo);
-
-  // TODO(shaochuan): Saving modified ResourceRequest back to |resource|, remove
-  // once dispatchWillSendRequest() takes const ResourceRequest.
-  // crbug.com/632580
-  resource->setResourceRequest(request);
+  context().dispatchWillSendRequest(
+      resource->identifier(), resource->resourceRequest(), ResourceResponse(),
+      resource->options().initiatorInfo);
 
   ResourceLoader* loader = ResourceLoader::create(this, resource);
   if (resource->shouldBlockLoadEvent())
     m_loaders.insert(loader);
   else
     m_nonBlockingLoaders.insert(loader);
 
   storePerformanceTimingInitiatorInformation(resource);
   resource->setFetcherSecurityOrigin(context().getSecurityOrigin());
 
-  loader->activateCacheAwareLoadingIfNeeded(request);
-  loader->start(request);
+  loader->activateCacheAwareLoadingIfNeeded(resource->resourceRequest());
+  loader->start(resource->resourceRequest());
   return true;
 }
 
 void ResourceFetcher::removeResourceLoader(ResourceLoader* loader) {
   DCHECK(loader);
   if (m_loaders.contains(loader))
     m_loaders.erase(loader);
   else if (m_nonBlockingLoaders.contains(loader))
     m_nonBlockingLoaders.erase(loader);
   else
@@ skipping 265 matching lines @@
   visitor->trace(m_context);
   visitor->trace(m_archive);
   visitor->trace(m_loaders);
   visitor->trace(m_nonBlockingLoaders);
   visitor->trace(m_documentResources);
   visitor->trace(m_preloads);
   visitor->trace(m_resourceTimingInfoMap);
 }
 
 }  // namespace blink