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

Unified Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 242373002: REGRESSION(r157081): Fix multipart handling of ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Landing 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 | « LayoutTests/http/tests/multipart/stop-loading-expected.txt ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index 48ef9d71fca50d00a5308b29ee33d42409e5173d..d90fbdec68168b13bc0030d4d9e8faa4888ef188 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -1250,10 +1250,10 @@ void ResourceFetcher::didDownloadData(const Resource* resource, int dataLength,
void ResourceFetcher::subresourceLoaderFinishedLoadingOnePart(ResourceLoader* loader)
{
- if (m_multipartLoaders)
- m_multipartLoaders->add(loader);
- if (m_loaders)
- m_loaders->remove(loader);
+ if (!m_multipartLoaders)
+ m_multipartLoaders = adoptPtr(new ResourceLoaderSet());
+ m_multipartLoaders->add(loader);
+ m_loaders->remove(loader);
if (LocalFrame* frame = this->frame())
return frame->loader().checkLoadComplete(m_documentLoader);
}
@@ -1270,9 +1270,10 @@ void ResourceFetcher::didInitializeResourceLoader(ResourceLoader* loader)
void ResourceFetcher::willTerminateResourceLoader(ResourceLoader* loader)
{
- if (!m_loaders || !m_loaders->contains(loader))
- return;
- m_loaders->remove(loader);
+ if (m_loaders && m_loaders->contains(loader))
+ m_loaders->remove(loader);
+ if (m_multipartLoaders && m_multipartLoaders->contains(loader))
+ m_multipartLoaders->remove(loader);
if (LocalFrame* frame = this->frame())
frame->loader().checkLoadComplete(m_documentLoader);
}
« no previous file with comments | « LayoutTests/http/tests/multipart/stop-loading-expected.txt ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698