Move FrameFetchContext::dispatchDidLoadResourceFromMemoryCache logic into ResourceFetcher

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@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
     License as published by the Free Software Foundation; either
@@ skipping 105 matching lines @@
 
   bool shouldDeferImageLoad(const KURL&) const;
 
   void recordResourceTimingOnRedirect(Resource*, const ResourceResponse&, bool);
 
   enum LoaderFinishType { DidFinishLoading, DidFinishFirstPartInMultipart };
   void handleLoaderFinish(Resource*, double finishTime, LoaderFinishType);
   void handleLoaderError(Resource*, const ResourceError&);
   bool isControlledByServiceWorker() const;
 
-  enum ResourceLoadStartType {
-    ResourceLoadingFromNetwork,
-    ResourceLoadingFromCache
-  };
   static const ResourceLoaderOptions& defaultResourceOptions();
 
   String getCacheIdentifier() const;
 
   WARN_UNUSED_RESULT static WebURLRequest::RequestContext
   determineRequestContext(Resource::Type, bool isMainFrame);
   WARN_UNUSED_RESULT WebURLRequest::RequestContext determineRequestContext(
       Resource::Type) const;
 
   void updateAllImageResourcePriorities();
@@ skipping 57 matching lines @@
   void moveResourceLoaderToNonBlocking(ResourceLoader*);
   void removeResourceLoader(ResourceLoader*);
   void handleLoadCompletion(Resource*);
 
   void initializeResourceRequest(ResourceRequest&,
                                  Resource::Type,
                                  FetchRequest::DeferOption);
   void requestLoadStarted(unsigned long identifier,
                           Resource*,
                           const FetchRequest&,
-                          ResourceLoadStartType,
+                          RevalidationPolicy,
                           bool isStaticData = false);
 
+  void didLoadResourceFromMemoryCache(unsigned long identifier,
+                                      Resource*,
+                                      const ResourceRequest&);
+
   bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);
 
   void resourceTimingReportTimerFired(TimerBase*);
 
   void reloadImagesIfNotDeferred();
 
   void updateMemoryCacheStats(Resource*,
                               RevalidationPolicy,
                               const FetchRequest&,
                               const ResourceFactory&,
@@ skipping 64 matching lines @@
   }
 
  private:
   Member<ResourceFetcher> m_loader;
   bool m_previousState;
 };
 
 }  // namespace blink
 
 #endif  // ResourceFetcher_h