Move the code in ResourceFetcher handling calls from WebURLLoaderImpl to ResourceLoader

third_party/WebKit/Source/core/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 97 matching lines @@
   void logPreloadStats(ClearPreloadsPolicy);
   void warnUnusedPreloads();
 
   MHTMLArchive* archive() const { return m_archive.get(); }
   ArchiveResource* createArchive(Resource*);
 
   void setDefersLoading(bool);
   void stopFetching();
   bool isFetching() const;
 
-  ResourceRequestBlockedReason willFollowRedirect(Resource*,
-                                                  ResourceRequest&,
-                                                  const ResourceResponse&);
-  enum DidFinishLoadingReason {
-    DidFinishLoading,
-    DidFinishFirstPartInMultipart
-  };
-  void didFinishLoading(Resource*,
-                        double finishTime,
-                        DidFinishLoadingReason);
-  void didFailLoading(Resource*, const ResourceError&);
-  void didReceiveResponse(Resource*,
-                          const ResourceResponse&,
-                          std::unique_ptr<WebDataConsumerHandle>);
-  void didReceiveData(const Resource*, const char* data, int dataLength);
-  void didReceiveTransferSizeUpdate(const Resource*, int transferSizeDiff);
-  void didDownloadData(const Resource*, int dataLength, int encodedDataLength);
-  bool defersLoading() const;
+  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;
 
@@ skipping 43 matching lines @@
   // RevalidationPolicy enum values are used in UMAs https://crbug.com/579496.
   enum RevalidationPolicy { Use, Revalidate, Reload, Load };
   RevalidationPolicy determineRevalidationPolicy(Resource::Type,
                                                  const FetchRequest&,
                                                  Resource* existingResource,
                                                  bool isStaticData) const;
 
   void moveCachedNonBlockingResourceToBlocking(Resource*, const FetchRequest&);
   void moveResourceLoaderToNonBlocking(ResourceLoader*);
   void removeResourceLoader(ResourceLoader*);
+  void handleLoadCompletion(Resource*);
 
   void initializeResourceRequest(ResourceRequest&,
                                  Resource::Type,
                                  FetchRequest::DeferOption);
-  void willSendRequest(unsigned long identifier,
-                       ResourceRequest&,
-                       const ResourceResponse&,
-                       const ResourceLoaderOptions&);
-  ResourceRequestBlockedReason canAccessResponse(Resource*,
-                                                 const ResourceResponse&) const;
-
   void requestLoadStarted(unsigned long identifier,
                           Resource*,
                           const FetchRequest&,
                           ResourceLoadStartType,
                           bool isStaticData = false);
 
   bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);
-  bool shouldDeferImageLoad(const KURL&) const;
 
   void resourceTimingReportTimerFired(TimerBase*);
 
   void reloadImagesIfNotDeferred();
 
   void updateMemoryCacheStats(Resource*,
                               RevalidationPolicy,
                               const FetchRequest&,
                               const ResourceFactory&,
                               bool isStaticData) const;
@@ skipping 63 matching lines @@
   }
 
  private:
   Member<ResourceFetcher> m_loader;
   bool m_previousState;
 };
 
 }  // namespace blink
 
 #endif  // ResourceFetcher_h