REGRESSION(r157081): Fix multipart handling of ResourceFetcher

Source/core/fetch/ResourceFetcher.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 1232 matching lines @@
     context().dispatchDidReceiveData(m_documentLoader, resource->identifier(), data, dataLength, encodedDataLength);
 }
 
 void ResourceFetcher::didDownloadData(const Resource* resource, int dataLength, int encodedDataLength)
 {
     context().dispatchDidDownloadData(m_documentLoader, resource->identifier(), dataLength, encodedDataLength);
 }
 
 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);
 }
 
 void ResourceFetcher::didInitializeResourceLoader(ResourceLoader* loader)
 {
     if (!m_document)
         return;
     if (!m_loaders)
         m_loaders = adoptPtr(new ResourceLoaderSet());
     ASSERT(!m_loaders->contains(loader));
     m_loaders->add(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);
 }
 
 void ResourceFetcher::willStartLoadingResource(ResourceRequest& request)
 {
     if (m_documentLoader)
         m_documentLoader->applicationCacheHost()->willStartLoadingResource(request);
 }
 
@@ skipping 144 matching lines @@
     case Revalidate:
         ++m_revalidateCount;
         return;
     case Use:
         ++m_useCount;
         return;
     }
 }
 
 }