Move FrameFetchContext::dispatchDidLoadResourceFromMemoryCache logic into ResourceFetcher

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 38 matching lines @@
 class KURL;
 class MHTMLArchive;
 class ResourceError;
 class ResourceResponse;
 class ResourceTimingInfo;
 class WebTaskRunner;
 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.
 //
 // Any processing that depends on components outside platform/loader/fetch/
 // should be implemented on a subclass of this interface, and then exposed to
 // the ResourceFetcher via this interface.
 class PLATFORM_EXPORT FetchContext
     : public GarbageCollectedFinalized<FetchContext> {
   WTF_MAKE_NONCOPYABLE(FetchContext);
@@ skipping 20 matching lines @@
 
   virtual void dispatchDidChangeResourcePriority(unsigned long identifier,
                                                  ResourceLoadPriority,
                                                  int intraPriorityValue);
   // The last callback before a request is actually sent to the browser process.
   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 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);
   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,
@@ skipping 69 matching lines @@
 
   virtual RefPtr<WebTaskRunner> loadingTaskRunner() const { return nullptr; }
 
  protected:
   FetchContext() {}
 };
 
 }  // namespace blink
 
 #endif