Delete ResourceLoaderSet

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

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 9b449c347b97a45570c5fdd5c5f113afc134a2b6..143bb107473035cb3e9ba5caad64db355803254b 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -33,7 +33,6 @@
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceLoader.h"
-#include "core/fetch/ResourceLoaderSet.h"
 #include "core/fetch/ResourceLoadingLog.h"
 #include "core/fetch/UniqueIdentifier.h"
 #include "platform/Histogram.h"
@@ -1057,8 +1056,16 @@ void ResourceFetcher::removeResourceLoader(ResourceLoader* loader)
 
 void ResourceFetcher::stopFetching()
 {
-    m_nonBlockingLoaders.cancelAll();
-    m_loaders.cancelAll();
+    HeapVector<Member<ResourceLoader>> loadersToCancel;
+    for (const auto& loader : m_nonBlockingLoaders)
+        loadersToCancel.append(loader);
+    for (const auto& loader : m_loaders)
+        loadersToCancel.append(loader);
+
+    for (const auto& loader : loadersToCancel) {
+        if (m_loaders.contains(loader) || m_nonBlockingLoaders.contains(loader))
+            loader->cancel();
+    }
 }
 
 bool ResourceFetcher::isFetching() const
@@ -1068,8 +1075,10 @@ bool ResourceFetcher::isFetching() const
 
 void ResourceFetcher::setDefersLoading(bool defers)
 {
-    m_loaders.setAllDefersLoading(defers);
-    m_nonBlockingLoaders.setAllDefersLoading(defers);
+    for (const auto& loader : m_nonBlockingLoaders)
+        loader->setDefersLoading(defers);

[Nate Chapin, 2016/08/30 22:38:31]

I don't think copying the loaders to a Vector is necessary here:
setDefersLoading shouldn't perform any callbacks synchronously like cancel()
does, it should just set state and schedule a task.

+    for (const auto& loader : m_loaders)
+        loader->setDefersLoading(defers);
 }
 
 bool ResourceFetcher::defersLoading() const