Clean up font loading

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

Index: third_party/WebKit/Source/core/fetch/Resource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
index bebf8ebba4f26f90adf1c79dc98706e3ffb0ff17..b770108ab3ebe7bba8334729060b519c0b80c016 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
@@ -254,6 +254,7 @@ DEFINE_TRACE(Resource)
 void Resource::load(ResourceFetcher* fetcher)
 {
     RELEASE_ASSERT(!m_loader);
+    ASSERT(stillNeedsLoad());
     m_status = Pending;
 
     ResourceRequest& request(m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest);
@@ -454,6 +455,12 @@ const ResourceRequest& Resource::lastResourceRequest() const
     return m_redirectChain.last().m_request;
 }
 
+void Resource::setRevalidatingRequest(const ResourceRequest& request)
+{
+    m_revalidatingRequest = request;
+    m_status = NotStarted;
+}
+
 void Resource::willFollowRedirect(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
 {
     newRequest.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredCredentials);