Clean up font loading

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@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
@@ skipping 239 matching lines @@
 
 DEFINE_TRACE(Resource)
 {
     visitor->trace(m_loader);
     visitor->trace(m_cacheHandler);
 }
 
 void Resource::load(ResourceFetcher* fetcher)
 {
     RELEASE_ASSERT(!m_loader);
+    ASSERT(stillNeedsLoad());

[Nate Chapin, 2016/04/07 23:46:16]

The changes to ImageResource were to facilitate this ASSERT.

     m_status = Pending;
 
     ResourceRequest& request(m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest);
     KURL url = request.url();
     request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredCredentials);
 
     m_loader = ResourceLoader::create(fetcher, this);
     m_loader->start(request);
     // If the request reference is null (i.e., a synchronous revalidation will
     // null the request), don't make the request non-null by setting the url.
@@ skipping 180 matching lines @@
     return currentAge(response, responseTimestamp) <= freshnessLifetime(response, responseTimestamp);
 }
 
 const ResourceRequest& Resource::lastResourceRequest() const
 {
     if (!m_redirectChain.size())
         return m_resourceRequest;
     return m_redirectChain.last().m_request;
 }
 
+void Resource::setRevalidatingRequest(const ResourceRequest& request)
+{
+    m_revalidatingRequest = request;
+    m_status = NotStarted;

[Nate Chapin, 2016/04/07 23:46:16]

Also to enable the ASSERT in Resource::load

+}
+
 void Resource::willFollowRedirect(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
 {
     newRequest.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredCredentials);
     m_redirectChain.append(RedirectPair(newRequest, redirectResponse));
 }
 
 bool Resource::unlock()
 {
     if (!m_data)
         return false;
@@ skipping 605 matching lines @@
     case Resource::Media:
         return "Media";
     case Resource::Manifest:
         return "Manifest";
     }
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 
 } // namespace blink