Index: Source/core/fetch/ResourceLoaderSet.cpp |
diff --git a/Source/core/fetch/ResourceLoaderSet.cpp b/Source/core/fetch/ResourceLoaderSet.cpp |
index ad478a9da1861717d2ed3791670533737953fabc..fd9d5378c3dab7a91e5465e002cc3a868f8b2f11 100644 |
--- a/Source/core/fetch/ResourceLoaderSet.cpp |
+++ b/Source/core/fetch/ResourceLoaderSet.cpp |
@@ -35,21 +35,19 @@ |
namespace blink { |
-PassOwnPtrWillBeRawPtr<ResourceLoaderSet> ResourceLoaderSet::create() |
+ResourceLoaderSet* ResourceLoaderSet::create() |
{ |
- return adoptPtrWillBeNoop(new ResourceLoaderSet); |
+ return new ResourceLoaderSet; |
} |
DEFINE_TRACE(ResourceLoaderSet) |
{ |
-#if ENABLE(OILPAN) |
visitor->trace(m_set); |
-#endif |
} |
void ResourceLoaderSet::cancelAll() |
{ |
- WillBeHeapVector<RefPtrWillBeMember<ResourceLoader>> loadersCopy; |
+ HeapVector<Member<ResourceLoader>> loadersCopy; |
copyToVector(m_set, loadersCopy); |
for (const auto& loader : loadersCopy) |
loader->cancel(); |
@@ -57,7 +55,7 @@ void ResourceLoaderSet::cancelAll() |
void ResourceLoaderSet::setAllDefersLoading(bool defers) |
{ |
- WillBeHeapVector<RefPtrWillBeMember<ResourceLoader>> loadersCopy; |
+ HeapVector<Member<ResourceLoader>> loadersCopy; |
copyToVector(m_set, loadersCopy); |
for (const auto& loader : loadersCopy) |
loader->setDefersLoading(defers); |