Move FrameFetchContext::dispatchDidLoadResourceFromMemoryCache logic into ResourceFetcher

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

Index: third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
diff --git a/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h b/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
index 5097526597e22da6b76283d3cdba239f38d917fa..5259613fb8671bab22983ba210503d540cff4837 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
+++ b/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
@@ -56,6 +56,8 @@ enum class WebCachePolicy;
 
 enum FetchResourceType { FetchMainResource, FetchSubresource };
 
+enum class ResourceLoadStartType { kNotFromMemoryCache, kFromMemoryCache };

[Nate Chapin, 2017/03/22 19:02:02]

Nit: it's not really "LoadStart" for the kNotFromMemoryCache case at response
time. Maybe we could have a ResourceResponseType enum just for
FetchContext::dispatchDidReceiveResponse() and just use the
ResourceFetcher::RevalidationPolicy for ResourceFetcher::requestLoadStarted()?

I think the only reason we had a special enum for requestLoadStarted() instead
of using the RevalidationPolicy was that requestLoadStarted() used to be public
and called from outside ResourceFetcher. But it's private now, so I don't think
there's a good reason not to just use RevalidationPolicy.

[kinuko, 2017/03/24 13:51:51]

Good point, done.

+
 // The FetchContext is an interface for performing context specific processing
 // in response to events in the ResourceFetcher. The ResourceFetcher or its job
 // class, ResourceLoader, may call the methods on a FetchContext.
@@ -96,16 +98,15 @@ class PLATFORM_EXPORT FetchContext
       ResourceRequest&,
       const ResourceResponse& redirectResponse,
       const FetchInitiatorInfo& = FetchInitiatorInfo());
-  virtual void dispatchDidLoadResourceFromMemoryCache(
-      unsigned long identifier,
-      Resource*,
-      WebURLRequest::FrameType,
-      WebURLRequest::RequestContext);
+  virtual void dispatchDidLoadResourceFromMemoryCache(unsigned long identifier,
+                                                      const ResourceRequest&,
+                                                      const ResourceResponse&);
   virtual void dispatchDidReceiveResponse(unsigned long identifier,
                                           const ResourceResponse&,
                                           WebURLRequest::FrameType,
                                           WebURLRequest::RequestContext,
-                                          Resource*);
+                                          Resource*,
+                                          ResourceLoadStartType);
   virtual void dispatchDidReceiveData(unsigned long identifier,
                                       const char* data,
                                       int dataLength);