Unify Resource loading status tracking

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 35 matching lines @@
 
     static PassRefPtrWillBeRawPtr<FontResource> fetch(FetchRequest&, ResourceFetcher*);
     ~FontResource() override;
 
     void load(ResourceFetcher*, const ResourceLoaderOptions&) override;
 
     void didAddClient(ResourceClient*) override;
 
     void allClientsRemoved() override;
     void beginLoadIfNeeded(ResourceFetcher* dl);
-    bool stillNeedsLoad() const override { return m_state < LoadInitiated; }
 
-    bool loadScheduled() const { return m_state != Unloaded; }
+    bool loadScheduled() const { return getStatus() == LoadStartScheduled; }
     void didScheduleLoad();
     void didUnscheduleLoad();
 
     void setCORSFailed() override { m_corsFailed = true; }
     bool isCORSFailed() const { return m_corsFailed; }
     String otsParsingMessage() const { return m_otsParsingMessage; }
 
     bool ensureCustomFontData();
     FontPlatformData platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation = FontOrientation::Horizontal);
 
@@ skipping 10 matching lines @@
         {
             return adoptRefWillBeNoop(new FontResource(request));
         }
     };
     FontResource(const ResourceRequest&);
 
     void checkNotify() override;
     void fontLoadShortLimitCallback(Timer<FontResource>*);
     void fontLoadLongLimitCallback(Timer<FontResource>*);
 
-    enum State { Unloaded, LoadScheduled, LoadInitiated, ShortLimitExceeded, LongLimitExceeded };
+    enum LoadLimitState { UnderLimit, ShortLimitExceeded, LongLimitExceeded };
 
     OwnPtr<FontCustomPlatformData> m_fontData;
     String m_otsParsingMessage;
-    State m_state;
+    LoadLimitState m_loadLimitState;
     bool m_corsFailed;
     Timer<FontResource> m_fontLoadShortLimitTimer;
     Timer<FontResource> m_fontLoadLongLimitTimer;
 
     friend class MemoryCache;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Font);
 
 class FontResourceClient : public ResourceClient {
 public:
     ~FontResourceClient() override {}
     static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == FontType; }
     ResourceClientType getResourceClientType() const final { return FontType; }
     virtual void fontLoaded(FontResource*) {}
     virtual void didStartFontLoad(FontResource*) {}
     virtual void fontLoadShortLimitExceeded(FontResource*) {}
     virtual void fontLoadLongLimitExceeded(FontResource*) {}
 };
 
 } // namespace blink
 
 #endif