Unify Resource loading status tracking

third_party/WebKit/Source/core/fetch/Resource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
 
     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 59 matching lines @@
         XSLStyleSheet,
         LinkPrefetch,
         LinkPreload,
         TextTrack,
         ImportResource,
         Media, // Audio or video file requested by a HTML5 media element
         Manifest
     };
 
     enum Status {
-        Unknown, // let cache decide what to do with it
-        Pending, // only partially loaded
-        Cached, // regular case
+        NotStarted,
+        LoadStartScheduled, // scheduled but not yet started, only used by fonts.
+        Pending, // load in progress
+        Cached, // load completed successfully
         LoadError,
         DecodeError
     };
 
     // Exposed for testing.
     static PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, Type type, const ResourceLoaderOptions& options = ResourceLoaderOptions())
     {
         return adoptRefWillBeNoop(new Resource(request, type, options));
     }
     virtual ~Resource();
@@ skipping 54 matching lines @@
     unsigned count() const { return m_clients.size(); }
 
     Status getStatus() const { return static_cast<Status>(m_status); }
     void setStatus(Status status) { m_status = status; }
 
     size_t size() const { return encodedSize() + decodedSize() + overheadSize(); }
     size_t encodedSize() const { return m_encodedSize; }
     size_t decodedSize() const { return m_decodedSize; }
     size_t overheadSize() const;
 
-    bool isLoaded() const { return !m_loading; } // FIXME. Method name is inaccurate. Loading might not have started yet.
+    bool isLoaded() const { return m_status > Pending; }
 
-    bool isLoading() const { return m_loading; }
-    void setLoading(bool b) { m_loading = b; }
-    virtual bool stillNeedsLoad() const { return false; }
+    bool isLoading() const { return m_status == Pending; }
+    bool stillNeedsLoad() const { return m_status < Pending; }
 
     ResourceLoader* loader() const { return m_loader.get(); }
 
     virtual bool isImage() const { return false; }
     bool shouldBlockLoadEvent() const;
     bool isLoadEventBlockingResourceType() const;
 
     // Computes the status of an object after loading.
     // Updates the expire date on the cache entry file
     void setLoadFinishTime(double finishTime) { m_loadFinishTime = finishTime; }
@@ skipping 176 matching lines @@
 
     unsigned long m_identifier;
 
     size_t m_encodedSize;
     size_t m_decodedSize;
     unsigned m_preloadCount;
 
     String m_cacheIdentifier;
 
     unsigned m_preloadResult : 2; // PreloadResult
-    unsigned m_requestedFromNetworkingLayer : 1;
-
-    unsigned m_loading : 1;
-
     unsigned m_type : 4; // Type
     unsigned m_status : 3; // Status
 
     unsigned m_needsSynchronousCacheHit : 1;
     unsigned m_linkPreload : 1;
 
     // Ordered list of all redirects followed while fetching this resource.
     Vector<RedirectPair> m_redirectChain;
 };
 
 class ResourceFactory {
     STACK_ALLOCATED();
 public:
     virtual PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest&, const ResourceLoaderOptions&, const String&) const = 0;
     Resource::Type type() const { return m_type; }
 
 protected:
     ResourceFactory(Resource::Type type) : m_type(type) { }
 
     Resource::Type m_type;
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->getType() == Resource::typeName, resource.getType() == Resource::typeName); \
     inline typeName##Resource* to##typeName##Resource(const RefPtrWillBeRawPtr<Resource>& ptr) { return to##typeName##Resource(ptr.get()); }
 
 } // namespace blink
 
 #endif