Make prepareRequest() a separate callback of FetchContext

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 481 matching lines @@
       /* Don't send security violation reports for speculative preloads */
       request.isSpeculativePreload()
           ? SecurityViolationReportingPolicy::SuppressReporting
           : SecurityViolationReportingPolicy::Report,
       request.getOriginRestriction());
   if (blockedReason != ResourceRequestBlockedReason::None) {
     DCHECK(!substituteData.forceSynchronousLoad());
     return Block;
   }
 
-  context().willStartLoadingResource(
-      identifier, resourceRequest, factory.type(),
-      request.options().initiatorInfo.name,
-      (request.isSpeculativePreload()
-           ? FetchContext::V8ActivityLoggingPolicy::SuppressLogging
-           : FetchContext::V8ActivityLoggingPolicy::Log));
+  // For initial requests, call prepareRequest() here before revalidation
+  // policy is determined.
+  context().prepareRequest(resourceRequest,
+                           FetchContext::RedirectType::kNotForRedirect);
+
   if (!request.url().isValid())
     return Abort;
 
   resourceRequest.setAllowStoredCredentials(
       request.options().allowCredentials == AllowStoredCredentials);
   return Continue;
 }
 
 Resource* ResourceFetcher::requestResource(
     FetchRequest& request,
@@ skipping 12 matching lines @@
   ResourceRequestBlockedReason blockedReason =
       ResourceRequestBlockedReason::None;
 
   PrepareRequestResult result = prepareRequest(request, factory, substituteData,
                                                identifier, blockedReason);
   if (result == Abort)
     return nullptr;
   if (result == Block)
     return resourceForBlockedRequest(request, factory, blockedReason);
 
+  if (!request.isSpeculativePreload()) {
+    // Only log if it's not for speculative preload.
+    context().recordLoadingActivity(identifier, resourceRequest, factory.type(),
+                                    request.options().initiatorInfo.name);
+  }
+
   bool isDataUrl = resourceRequest.url().protocolIsData();
   bool isStaticData = isDataUrl || substituteData.isValid() || m_archive;
   if (isStaticData) {
     resource = resourceForStaticData(request, factory, substituteData);
     // Abort the request if the archive doesn't contain the resource, except in
     // the case of data URLs which might have resources such as fonts that need
     // to be decoded only on demand.  These data URLs are allowed to be
     // processed using the normal ResourceFetcher machinery.
     if (!resource && !isDataUrl && m_archive)
       return nullptr;
@@ skipping 996 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