Clear Resource::m_loader in Resource::finish() and Resource::error()

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 710 matching lines @@
     }
 
     // During the initial load, avoid loading the same resource multiple times for a single document,
     // even if the cache policies would tell us to.
     // We also group loads of the same resource together.
     // Raw resources are exempted, as XHRs fall into this category and may have user-set Cache-Control:
     // headers or other factors that require separate requests.
     if (type != Resource::Raw) {
         if (!context().isLoadComplete() && m_validatedURLs.contains(existingResource->url()))
             return Use;
-        // TODO(japhet): existingResource->isLoading() and existingResource->loader() are not identical,
-        // which is lame.
-        // Being in the loading state and having a ResourceLoader* are subtly diffent cases, either of which
-        // should indicate reuse. A resource can have isLoading() return true without a ResourceLoader* if
-        // it is a font that defers actually loading until the font is required. On the other hand,
-        // a Resource can have a non-null ResourceLoader* but have isLoading() return false in a narrow window
-        // during completion, because we set loading to false before notifying ResourceClients, but don't
-        // clear the ResourceLoader pointer until the stack unwinds. If, inside the ResourceClient callbacks,
-        // an event fires synchronously and an event handler re-requests the resource, we can reach this point
-        // while not loading but having a ResourceLoader.
-        if (existingResource->isLoading() || existingResource->loader())
+        if (existingResource->isLoading())
             return Use;
     }
 
     // CachePolicyReload always reloads
     if (cachePolicy == CachePolicyReload) {
         WTF_LOG(ResourceLoading, "ResourceFetcher::determineRevalidationPolicy reloading due to CachePolicyReload.");
         return Reload;
     }
 
     // We'll try to reload the resource if it failed last time.
@@ skipping 422 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