Remove resource type-specific fetching logic from ResourceFetcher

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
     version 2 of the License, or (at your option) any later version.
@@ skipping 55 matching lines @@
 // RefPtr<ResourceFetcher> for their lifetime (and will create one if they
 // are initialized without a LocalFrame), so a Document can keep a ResourceFetcher
 // alive past detach if scripts still reference the Document.
 class CORE_EXPORT ResourceFetcher : public RefCountedWillBeGarbageCollectedFinalized<ResourceFetcher> {
     WTF_MAKE_NONCOPYABLE(ResourceFetcher); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(ResourceFetcher);
 public:
     static PassRefPtrWillBeRawPtr<ResourceFetcher> create(PassOwnPtrWillBeRawPtr<FetchContext> context) { return adoptRefWillBeNoop(new ResourceFetcher(context)); }
     virtual ~ResourceFetcher();
     DECLARE_VIRTUAL_TRACE();
 
-    ResourcePtr<Resource> fetchSynchronously(FetchRequest&);
-    ResourcePtr<ImageResource> fetchImage(FetchRequest&);
-    ResourcePtr<CSSStyleSheetResource> fetchCSSStyleSheet(FetchRequest&);
-    ResourcePtr<ScriptResource> fetchScript(FetchRequest&);
-    ResourcePtr<FontResource> fetchFont(FetchRequest&);
-    ResourcePtr<RawResource> fetchRawResource(FetchRequest&);
-    ResourcePtr<RawResource> fetchMainResource(FetchRequest&, const SubstituteData&);
-    ResourcePtr<DocumentResource> fetchSVGDocument(FetchRequest&);
-    ResourcePtr<XSLStyleSheetResource> fetchXSLStyleSheet(FetchRequest&);
-    ResourcePtr<Resource> fetchLinkResource(Resource::Type, FetchRequest&);
-    ResourcePtr<Resource> fetchLinkPreloadResource(Resource::Type, FetchRequest&);
-    ResourcePtr<RawResource> fetchImport(FetchRequest&);
-    ResourcePtr<RawResource> fetchMedia(FetchRequest&);
-    ResourcePtr<RawResource> fetchTextTrack(FetchRequest&);
+    ResourcePtr<Resource> requestResource(FetchRequest&, const ResourceFactory&);
 
     Resource* cachedResource(const KURL&) const;
 
     typedef HashMap<String, ResourcePtr<Resource>> DocumentResourceMap;
     const DocumentResourceMap& allResources() const { return m_documentResources; }
 
     bool autoLoadImages() const { return m_autoLoadImages; }
     void setAutoLoadImages(bool);
 
     void setImagesEnabled(bool);
 
     bool shouldDeferImageLoad(const KURL&) const;
 
     FetchContext& context() const { return m_context ? *m_context.get() : FetchContext::nullInstance(); }
     void clearContext() { m_context.clear(); }
 
     void garbageCollectDocumentResources();
 
     int requestCount() const;
 
     bool isPreloaded(const KURL&) const;
     void clearPreloads();
-    void preload(Resource::Type, FetchRequest&, const String& charset);
+    void preloadStarted(Resource*);
     void printPreloadStats();
 
     void addAllArchiveResources(MHTMLArchive*);
     ArchiveResourceCollection* archiveResourceCollection() const { return m_archiveResourceCollection.get(); }
 
     void setDefersLoading(bool);
     void stopFetching();
     bool isFetching() const;
 
     void didLoadResource();
@@ skipping 25 matching lines @@
 
     enum ResourceLoadStartType {
         ResourceLoadingFromNetwork,
         ResourceLoadingFromCache
     };
     void requestLoadStarted(Resource*, const FetchRequest&, ResourceLoadStartType);
     static const ResourceLoaderOptions& defaultResourceOptions();
 
     String getCacheIdentifier() const;
 
+    void scheduleDocumentResourcesGC();
+    bool clientDefersImage(const KURL&) const;
+    void determineRequestContext(ResourceRequest&, Resource::Type);
+
 private:
     friend class ResourceCacheValidationSuppressor;
 
     explicit ResourceFetcher(PassOwnPtrWillBeRawPtr<FetchContext>);
 
-    ResourcePtr<Resource> requestResource(Resource::Type, FetchRequest&);
-    ResourcePtr<Resource> createResourceForRevalidation(const FetchRequest&, Resource*);
-    ResourcePtr<Resource> createResourceForLoading(Resource::Type, FetchRequest&, const String& charset);
-    void preCacheDataURIImage(const FetchRequest&);
-    void preCacheSubstituteDataForMainResource(const FetchRequest&, const SubstituteData&);
+    ResourcePtr<Resource> createResourceForRevalidation(const FetchRequest&, Resource*, const ResourceFactory&);
+    ResourcePtr<Resource> createResourceForLoading(FetchRequest&, const String& charset, const ResourceFactory&);
     void storeResourceTimingInitiatorInformation(Resource*);
     bool scheduleArchiveLoad(Resource*, const ResourceRequest&);
 
     enum RevalidationPolicy { Use, Revalidate, Reload, Load };
     RevalidationPolicy determineRevalidationPolicy(Resource::Type, const FetchRequest&, Resource* existingResource) const;
 
-    void determineRequestContext(ResourceRequest&, Resource::Type);
     void addAdditionalRequestHeaders(ResourceRequest&, Resource::Type);
 
     static bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);
 
     void notifyLoadedFromMemoryCache(Resource*);
 
     void garbageCollectDocumentResourcesTimerFired(Timer<ResourceFetcher>*);
-    void scheduleDocumentResourcesGC();
 
     void resourceTimingReportTimerFired(Timer<ResourceFetcher>*);
 
-    bool clientDefersImage(const KURL&) const;
     void reloadImagesIfNotDeferred();
 
     void willTerminateResourceLoader(ResourceLoader*);
 
     OwnPtrWillBeMember<FetchContext> m_context;
 
     HashSet<String> m_validatedURLs;
     mutable DocumentResourceMap m_documentResources;
 
     OwnPtr<ListHashSet<Resource*>> m_preloads;
@@ skipping 50 matching lines @@
             m_loader->m_allowStaleResources = m_previousState;
     }
 private:
     RawPtrWillBeMember<ResourceFetcher> m_loader;
     bool m_previousState;
 };
 
 } // namespace blink
 
 #endif // ResourceFetcher_h