Unify Resource loading status tracking

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

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * 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
@@ skipping 61 matching lines @@
 
 PassRefPtrWillBeRawPtr<FontResource> FontResource::fetch(FetchRequest& request, ResourceFetcher* fetcher)
 {
     ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone);
     request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextFont);
     return toFontResource(fetcher->requestResource(request, FontResourceFactory()));
 }
 
 FontResource::FontResource(const ResourceRequest& resourceRequest)
     : Resource(resourceRequest, Font)
-    , m_state(Unloaded)
+    , m_loadLimitState(UnderLimit)
     , m_corsFailed(false)
     , m_fontLoadShortLimitTimer(this, &FontResource::fontLoadShortLimitCallback)
     , m_fontLoadLongLimitTimer(this, &FontResource::fontLoadLongLimitCallback)
 {
 }
 
 FontResource::~FontResource()
 {
 }
 
 void FontResource::didScheduleLoad()
 {
-    if (m_state == Unloaded)
-        m_state = LoadScheduled;
+    if (getStatus() == NotStarted)
+        setStatus(LoadStartScheduled);
 }
 
 void FontResource::didUnscheduleLoad()
 {
-    if (m_state == LoadScheduled)
-        m_state = Unloaded;
+    if (getStatus() == LoadStartScheduled)
+        setStatus(NotStarted);
 }
 
 void FontResource::load(ResourceFetcher*, const ResourceLoaderOptions& options)
 {
     // Don't load the file yet. Wait for an access before triggering the load.
-    setLoading(true);
     m_options = options;
     if (!m_revalidatingRequest.isNull())
-        m_state = Unloaded;
+        setStatus(NotStarted);
 }
 
 void FontResource::didAddClient(ResourceClient* c)
 {
     ASSERT(FontResourceClient::isExpectedType(c));
     Resource::didAddClient(c);
-    if (!isLoading())
+    if (isLoaded())
         static_cast<FontResourceClient*>(c)->fontLoaded(this);
-    if (m_state == ShortLimitExceeded || m_state == LongLimitExceeded)
+    if (m_loadLimitState == ShortLimitExceeded || m_loadLimitState == LongLimitExceeded)
         static_cast<FontResourceClient*>(c)->fontLoadShortLimitExceeded(this);
-    if (m_state == LongLimitExceeded)
+    if (m_loadLimitState == LongLimitExceeded)
         static_cast<FontResourceClient*>(c)->fontLoadLongLimitExceeded(this);
 }
 
 void FontResource::beginLoadIfNeeded(ResourceFetcher* dl)
 {
     if (stillNeedsLoad()) {
-        m_state = LoadInitiated;
         Resource::load(dl, m_options);
         m_fontLoadShortLimitTimer.startOneShot(fontLoadWaitShortLimitSec, BLINK_FROM_HERE);
         m_fontLoadLongLimitTimer.startOneShot(fontLoadWaitLongLimitSec, BLINK_FROM_HERE);
 
         ResourceClientWalker<FontResourceClient> walker(m_clients);
         while (FontResourceClient* client = walker.next())
             client->didStartFontLoad(this);
     }
 }
 
@@ skipping 21 matching lines @@
 
 bool FontResource::isSafeToUnlock() const
 {
     return m_data->hasOneRef();
 }
 
 void FontResource::fontLoadShortLimitCallback(Timer<FontResource>*)
 {
     if (!isLoading())
         return;
-    ASSERT(m_state == LoadInitiated);
-    m_state = ShortLimitExceeded;
+    ASSERT(m_loadLimitState == UnderLimit);
+    m_loadLimitState = ShortLimitExceeded;
     ResourceClientWalker<FontResourceClient> walker(m_clients);
     while (FontResourceClient* client = walker.next())
         client->fontLoadShortLimitExceeded(this);
 }
 
 void FontResource::fontLoadLongLimitCallback(Timer<FontResource>*)
 {
     if (!isLoading())
         return;
-    ASSERT(m_state == ShortLimitExceeded);
-    m_state = LongLimitExceeded;
+    ASSERT(m_loadLimitState == ShortLimitExceeded);
+    m_loadLimitState = LongLimitExceeded;
     ResourceClientWalker<FontResourceClient> walker(m_clients);
     while (FontResourceClient* client = walker.next())
         client->fontLoadLongLimitExceeded(this);
 }
 
 void FontResource::allClientsRemoved()
 {
     m_fontData.clear();
     Resource::allClientsRemoved();
 }
 
 void FontResource::checkNotify()
 {
     m_fontLoadShortLimitTimer.stop();
     m_fontLoadLongLimitTimer.stop();
     ResourceClientWalker<FontResourceClient> w(m_clients);
     while (FontResourceClient* c = w.next())
         c->fontLoaded(this);
 }
 
 } // namespace blink