Make prepareRequest() a separate callback of FetchContext

third_party/WebKit/Source/platform/loader/fetch/FetchContext.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 72 matching lines @@
   // a const reference as a header needs to be added for doc.write blocking
   // intervention.
   virtual WebCachePolicy resourceRequestCachePolicy(
       ResourceRequest&,
       Resource::Type,
       FetchRequest::DeferOption) const;
 
   virtual void dispatchDidChangeResourcePriority(unsigned long identifier,
                                                  ResourceLoadPriority,
                                                  int intraPriorityValue);
+
+  // This internally dispatches WebFrameClient::willSendRequest hook

[kinuko, 2017/03/15 04:49:19]

'and' is missing before 'hook'

[Nate Chapin, 2017/03/22 19:12:59]

Nit: 'hooks'

[kinuko, 2017/03/23 05:12:17]

Done.

+  // request interceptors like ServiceWorker and ApplicationCache.
+  // This may modify the request.
+  enum class RedirectType { kForRedirect, kNotForRedirect };
+  virtual void prepareRequest(ResourceRequest&, RedirectType);
+
   // The last callback before a request is actually sent to the browser process.
+  // TODO(https://crbug.com/632580): make this take const ResourceRequest&.
   virtual void dispatchWillSendRequest(
       unsigned long identifier,
       ResourceRequest&,
       const ResourceResponse& redirectResponse,
       const FetchInitiatorInfo& = FetchInitiatorInfo());
+
   virtual void dispatchDidLoadResourceFromMemoryCache(
       unsigned long identifier,
       Resource*,
       WebURLRequest::FrameType,
       WebURLRequest::RequestContext);
   virtual void dispatchDidReceiveResponse(unsigned long identifier,
                                           const ResourceResponse&,
                                           WebURLRequest::FrameType,
                                           WebURLRequest::RequestContext,
                                           Resource*);
   virtual void dispatchDidReceiveData(unsigned long identifier,
                                       const char* data,
                                       int dataLength);
   virtual void dispatchDidReceiveEncodedData(unsigned long identifier,
                                              int encodedDataLength);
   virtual void dispatchDidDownloadData(unsigned long identifier,
                                        int dataLength,
                                        int encodedDataLength);
   virtual void dispatchDidFinishLoading(unsigned long identifier,
                                         double finishTime,
                                         int64_t encodedDataLength,
                                         int64_t decodedBodyLength);
   virtual void dispatchDidFail(unsigned long identifier,
                                const ResourceError&,
                                int64_t encodedDataLength,
                                bool isInternalRequest);
 
   virtual bool shouldLoadNewResource(Resource::Type) const { return false; }
+
   // Called when a resource load is first requested, which may not be when the
   // load actually begins.
-  enum class V8ActivityLoggingPolicy { SuppressLogging, Log };
-  virtual void willStartLoadingResource(unsigned long identifier,
-                                        ResourceRequest&,
-                                        Resource::Type,
-                                        const AtomicString& fetchInitiatorName,
-                                        V8ActivityLoggingPolicy);
+  virtual void recordLoadingActivity(unsigned long identifier,
+                                     const ResourceRequest&,
+                                     Resource::Type,
+                                     const AtomicString& fetchInitiatorName);
+
   virtual void didLoadResource(Resource*);
 
   virtual void addResourceTiming(const ResourceTimingInfo&);
   virtual bool allowImage(bool, const KURL&) const { return false; }
   virtual ResourceRequestBlockedReason canRequest(
       Resource::Type,
       const ResourceRequest&,
       const KURL&,
       const ResourceLoaderOptions&,
       SecurityViolationReportingPolicy,
@@ skipping 43 matching lines @@
 
   virtual RefPtr<WebTaskRunner> loadingTaskRunner() const { return nullptr; }
 
  protected:
   FetchContext() {}
 };
 
 }  // namespace blink
 
 #endif