Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1085)

Side by Side Diff: third_party/WebKit/Source/core/fetch/ResourceLoaderSet.cpp

Issue 1923003002: Clear Resource::m_loader in Resource::finish() and Resource::error() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, comment in background.js Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 30 matching lines...) Expand all
41 41
42 DEFINE_TRACE(ResourceLoaderSet) 42 DEFINE_TRACE(ResourceLoaderSet)
43 { 43 {
44 visitor->trace(m_set); 44 visitor->trace(m_set);
45 } 45 }
46 46
47 void ResourceLoaderSet::cancelAll() 47 void ResourceLoaderSet::cancelAll()
48 { 48 {
49 HeapVector<Member<ResourceLoader>> loadersCopy; 49 HeapVector<Member<ResourceLoader>> loadersCopy;
50 copyToVector(m_set, loadersCopy); 50 copyToVector(m_set, loadersCopy);
51 for (const auto& loader : loadersCopy) 51 for (const auto& loader : loadersCopy) {
52 loader->cancel(); 52 // cancelAll() can reenter. Don't cancel the same ResourceLoader twice.
53 if (m_set.contains(loader))
54 loader->cancel();
55 }
53 } 56 }
54 57
55 void ResourceLoaderSet::setAllDefersLoading(bool defers) 58 void ResourceLoaderSet::setAllDefersLoading(bool defers)
56 { 59 {
57 HeapVector<Member<ResourceLoader>> loadersCopy; 60 HeapVector<Member<ResourceLoader>> loadersCopy;
58 copyToVector(m_set, loadersCopy); 61 copyToVector(m_set, loadersCopy);
59 for (const auto& loader : loadersCopy) 62 for (const auto& loader : loadersCopy)
60 loader->setDefersLoading(defers); 63 loader->setDefersLoading(defers);
61 } 64 }
62 65
63 } // namespace blink 66 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698