Changeset 21782 in webkit

Timestamp:

May 25, 2007 3:43:57 PM (17 years ago)

Author:

andersca

Message:

Reviewed by Brady.

<rdar://problem/5209536>
​http://bugs.webkit.org/show_bug.cgi?id=13757
REGRESSION: Leaks seen on buildbot after r21497.

Fix multipart data loading so it works like Tiger Safari. When one part of a multipart connection has been loaded,
move the subresource loader from the subresource loaders set and into a special multipart subresource loader set. This set
is not considered when asking a document loader if it's currently loading.

• loader/DocumentLoader.cpp: (WebCore::DocumentLoader::stopLoading): Always stop the multipart subresource loaders here.

(WebCore::DocumentLoader::subresourceLoaderFinishedLoadingOnePart):
New function that moves the loader from m_subresourceLoaders to m_multipartSubresourceLoaders and updates the document loader's state.

• loader/ProgressTracker.cpp: (WebCore::ProgressTracker::incrementProgress): If a progress item already exists, reuse it. This can happen in some rare circumstances when dealing with multipart data.

• loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::didReceiveResponse): Call subresourceLoaderFinishedLoadingOnePart if the response is multipart.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (2 diffs)
• loader/DocumentLoader.h (modified) (2 diffs)
• loader/ProgressTracker.cpp (modified) (1 diff)
• loader/SubresourceLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-25  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Brady.
+
+        <rdar://problem/5209536>
+        http://bugs.webkit.org/show_bug.cgi?id=13757
+        REGRESSION: Leaks seen on buildbot after r21497.
+        
+        Fix multipart data loading so it works like Tiger Safari. When one part of a multipart connection has been loaded,
+        move the subresource loader from the subresource loaders set and into a special multipart subresource loader set. This set 
+        is not considered when asking a document loader if it's currently loading. 
+                
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::stopLoading):
+        Always stop the multipart subresource loaders here.
+        
+        (WebCore::DocumentLoader::subresourceLoaderFinishedLoadingOnePart):
+        New function that moves the loader from m_subresourceLoaders to m_multipartSubresourceLoaders and updates the document loader's state.
+        
+        * loader/ProgressTracker.cpp:
+        (WebCore::ProgressTracker::incrementProgress):
+        If a progress item already exists, reuse it. This can happen in some rare circumstances when dealing with multipart data.
+        
+        * loader/SubresourceLoader.cpp:
+        (WebCore::SubresourceLoader::didReceiveResponse):
+        Call subresourceLoaderFinishedLoadingOnePart if the response is multipart.
+
 2007-05-25  Patti Hoa  <patti@apple.com>
 

trunk/WebCore/loader/DocumentLoader.cpp

@@ -264 +264 @@
             m_frame->loader()->stopLoading(false);
     }
-    
+
+    // Always cancel multipart loaders
+    cancelAll(m_multipartSubresourceLoaders);
+
     if (!loading)
         return;
@@ -699 +702 @@
 }
 
-}
+void DocumentLoader::subresourceLoaderFinishedLoadingOnePart(ResourceLoader* loader)
+{
+    m_multipartSubresourceLoaders.add(loader);
+    m_subresourceLoaders.remove(loader);
+    updateLoading();
+    if (Frame* frame = m_frame)
+        frame->loader()->checkLoadComplete();    
+}
+
+}

trunk/WebCore/loader/DocumentLoader.h

@@ -149 +149 @@
         void removePlugInStreamLoader(ResourceLoader*);
 
+        void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*);
+        
     private:
         void setupForReplace();
@@ -161 +163 @@
         RefPtr<MainResourceLoader> m_mainResourceLoader;
         ResourceLoaderSet m_subresourceLoaders;
+        ResourceLoaderSet m_multipartSubresourceLoaders;
         ResourceLoaderSet m_plugInStreamLoaders;
 

trunk/WebCore/loader/ProgressTracker.cpp

@@ -162 +162 @@
     m_totalPageAndResourceBytesToLoad += estimatedLength;
 
-    m_progressItems.set(identifier, new ProgressItem(estimatedLength));
+    if (ProgressItem* item = m_progressItems.get(identifier)) {
+        item->bytesReceived = 0;
+        item->estimatedLength = estimatedLength;
+    } else
+        m_progressItems.set(identifier, new ProgressItem(estimatedLength));
 }
 

trunk/WebCore/loader/SubresourceLoader.cpp

@@ -162 +162 @@
         
         // After the first multipart section is complete, signal to delegates that this load is "finished" 
+        m_documentLoader->subresourceLoaderFinishedLoadingOnePart(this);
         didFinishLoadingOnePart();
     }