[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 7255ffdbb0556c3b42c976bb580a565c604b4f66
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 23 05:18:15 2002 +0000

            Fixed download data source leaks when downloads are cancelled.
    
            * WebView.subproj/IFBaseWebControllerPrivate.mm:
            (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
            * WebView.subproj/IFMainURLHandleClient.mm:
            (-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]):
            (-[IFMainURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1203 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5fef380..5bc71b0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,4 +1,14 @@
 2002-05-22  Chris Blumenberg  <cblu at apple.com>
+	
+	Fixed download data source leaks when downloads are cancelled.
+
+	* WebView.subproj/IFBaseWebControllerPrivate.mm:
+	(-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+	* WebView.subproj/IFMainURLHandleClient.mm:
+	(-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+	(-[IFMainURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+
+2002-05-22  Chris Blumenberg  <cblu at apple.com>
 
 	Removed activate events as this was causing problems
 	for the QT plug-in.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5fef380..5bc71b0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,4 +1,14 @@
 2002-05-22  Chris Blumenberg  <cblu at apple.com>
+	
+	Fixed download data source leaks when downloads are cancelled.
+
+	* WebView.subproj/IFBaseWebControllerPrivate.mm:
+	(-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+	* WebView.subproj/IFMainURLHandleClient.mm:
+	(-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+	(-[IFMainURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+
+2002-05-22  Chris Blumenberg  <cblu at apple.com>
 
 	Removed activate events as this was causing problems
 	for the QT plug-in.
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index b87ed37..38488ee 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -92,6 +92,7 @@
 - (void)_mainReceivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource
 {
     IFWebFrame *frame = [dataSource webFrame];
+    IFContentPolicy contentPolicy = [dataSource contentPolicy];
     
     WEBKIT_ASSERT (dataSource != nil);
 
@@ -108,6 +109,11 @@
 
     [self receivedProgress: progress forResource: resourceDescription fromDataSource: dataSource];
 
+    if(progress->bytesSoFar == progress->totalToLoad){
+        if(contentPolicy == IFContentPolicyOpenExternally || contentPolicy == IFContentPolicySave)
+            [dataSource _setPrimaryLoadComplete: YES];
+    }
+    
     // The frame may be nil if a previously cancelled load is still making progress callbacks.
     if (frame == nil)
         return;
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index abd38fa..228576a 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -75,7 +75,9 @@
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
 {
     WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
-
+    
+    [downloadHandler release];
+    
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
     loadProgress->totalToLoad = -1;
     loadProgress->bytesSoFar = -1;
@@ -167,6 +169,8 @@
 {
     WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, result = %s\n", [[[sender url] absoluteString] cString], [[result errorDescription] lossyCString]);
 
+    [downloadHandler release];
+
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
     loadProgress->totalToLoad = [sender contentLength];
     loadProgress->bytesSoFar = [sender contentLengthReceived];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index abd38fa..228576a 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -75,7 +75,9 @@
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
 {
     WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
-
+    
+    [downloadHandler release];
+    
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
     loadProgress->totalToLoad = -1;
     loadProgress->bytesSoFar = -1;
@@ -167,6 +169,8 @@
 {
     WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, result = %s\n", [[[sender url] absoluteString] cString], [[result errorDescription] lossyCString]);
 
+    [downloadHandler release];
+
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
     loadProgress->totalToLoad = [sender contentLength];
     loadProgress->bytesSoFar = [sender contentLengthReceived];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index abd38fa..228576a 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -75,7 +75,9 @@
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
 {
     WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
-
+    
+    [downloadHandler release];
+    
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
     loadProgress->totalToLoad = -1;
     loadProgress->bytesSoFar = -1;
@@ -167,6 +169,8 @@
 {
     WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, result = %s\n", [[[sender url] absoluteString] cString], [[result errorDescription] lossyCString]);
 
+    [downloadHandler release];
+
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
     loadProgress->totalToLoad = [sender contentLength];
     loadProgress->bytesSoFar = [sender contentLengthReceived];

-- 
WebKit Debian packaging