Unify Resource loading status tracking

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
     version 2 of the License, or (at your option) any later version.
@@ skipping 62 matching lines @@
     virtual ~ResourceFetcher();
     DECLARE_VIRTUAL_TRACE();
 
     PassRefPtrWillBeRawPtr<Resource> requestResource(FetchRequest&, const ResourceFactory&, const SubstituteData& = SubstituteData());
 
     Resource* cachedResource(const KURL&) const;
 
     using DocumentResourceMap = WillBeHeapHashMap<String, WeakPtrWillBeWeakMember<Resource>>;
     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(); }
 
     int requestCount() const;
 
     enum ClearPreloadsPolicy { ClearAllPreloads, ClearSpeculativeMarkupPreloads };
 
     bool isPreloaded(const KURL&) const;
     void clearPreloads(ClearPreloadsPolicy = ClearAllPreloads);
     void preloadStarted(Resource*);
@@ skipping 32 matching lines @@
 
     enum ResourceLoadStartType {
         ResourceLoadingFromNetwork,
         ResourceLoadingFromCache
     };
     void requestLoadStarted(Resource*, const FetchRequest&, ResourceLoadStartType, bool isStaticData = false);
     static const ResourceLoaderOptions& defaultResourceOptions();
 
     String getCacheIdentifier() const;
 
-    bool clientDefersImage(const KURL&) const;
     static void determineRequestContext(ResourceRequest&, Resource::Type, bool isMainFrame);
     void determineRequestContext(ResourceRequest&, Resource::Type);
 
     WebTaskRunner* loadingTaskRunner();
 
     void updateAllImageResourcePriorities();
 
     void reloadLoFiImages();
 
     // This is only exposed for testing purposes.
@@ skipping 12 matching lines @@
     PassRefPtrWillBeRawPtr<Resource> resourceForStaticData(const FetchRequest&, const ResourceFactory&, const SubstituteData&);
 
     // 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 initializeResourceRequest(ResourceRequest&, Resource::Type);
 
-    static bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);
+    bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);
+    bool shouldDeferImageLoad(const KURL&) const;
 
     void resourceTimingReportTimerFired(Timer<ResourceFetcher>*);
 
     void reloadImagesIfNotDeferred();
 
     void updateMemoryCacheStats(Resource*, RevalidationPolicy, const FetchRequest&,  const ResourceFactory&, bool isStaticData) const;
 
     Member<FetchContext> m_context;
 
     HashSet<String> m_validatedURLs;
@@ skipping 53 matching lines @@
             m_loader->m_allowStaleResources = m_previousState;
     }
 private:
     Member<ResourceFetcher> m_loader;
     bool m_previousState;
 };
 
 } // namespace blink
 
 #endif // ResourceFetcher_h