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

Unified Diff: Source/core/loader/DocumentLoader.cpp

Issue 242373002: REGRESSION(r157081): Fix multipart handling of ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/DocumentLoader.cpp
diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp
index e57453a91dbb40af78a00c064845f893fed506fb..9363f43c5e4d81f6ce3a4f43e43e3d7fbe158a2c 100644
--- a/Source/core/loader/DocumentLoader.cpp
+++ b/Source/core/loader/DocumentLoader.cpp
@@ -188,8 +188,11 @@ void DocumentLoader::stopLoading()
m_frame->loader().stopLoading();
}
- if (!loading)
+ if (!loading) {
+ // This is needed to cancel multipart loading which can be happening even after the frame is loaded.
+ m_fetcher->stopFetching();
Nate Chapin 2014/04/18 18:10:29 Is the ordering of this call important? If not, I'
return;
+ }
if (m_loadingMainResource) {
// Stop the main resource loader and let it send the cancelled message.
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698