Clean up font loading

third_party/WebKit/Source/core/fetch/ResourceFetcher.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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     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 642 matching lines @@
     //    cached or it is a data: url. In this case, we "Reload" the image,
     //    then defer it with resourceNeedsLoad() so that it never actually
     //    goes to the network.
     // 2. Images are enabled, but not loaded automatically. In this case, we
     //    will Use cached resources or data: urls, but will similarly fall back
     //    to a deferred network load if we don't have the data available
     //    without a network request. We check allowImage() here, which is
     //    affected by m_imagesEnabled but not m_autoLoadImages, in order to
     //    allow for this differing behavior.
     // TODO(japhet): Can we get rid of one of these settings?
-    if (FetchRequest::DeferredByClient == fetchRequest.defer())
-        return Reload;
-    if (existingResource->isImage() && !context().allowImage(m_imagesEnabled, existingResource->url()))
+    if (existingResource->isImage() && (FetchRequest::DeferredByClient == fetchRequest.defer() || !context().allowImage(m_imagesEnabled, existingResource->url())))
         return Reload;
 
     // Never use cache entries for downloadToFile / useStreamOnResponse
     // requests. The data will be delivered through other paths.
     if (request.downloadToFile() || request.useStreamOnResponse())
         return Reload;
 
     // If resource was populated from a SubstituteData load or data: url, use it.
     if (isStaticData)
         return Use;
@@ skipping 501 matching lines @@
     visitor->trace(m_context);
     visitor->trace(m_archive);
     visitor->trace(m_loaders);
     visitor->trace(m_nonBlockingLoaders);
     visitor->trace(m_documentResources);
     visitor->trace(m_preloads);
     visitor->trace(m_resourceTimingInfoMap);
 }
 
 } // namespace blink