[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 29dc171a9ce76d6512dbc5d6e237bd3fa473e907
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 11 01:44:41 2002 +0000

    WebKit:
    
    	Fixes for:
    	2981866 - Download doesn't appear in Downloads window if link was command-clicked
    	2965312 - Download progress not shown when clicking on download link with Alex not running
    
            * WebView.subproj/IFMainURLHandleClient.mm:
            (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]): retain
    	the downloadProgressHandler before calling requestContentPolicy as the web controller may be released
    	in requestContentPolicy
    
    WebBrowser:
    
    	Fixes for:
            2981866 - Download doesn't appear in Downloads window if link was command-clicked
            2965312 - Download progress not shown when clicking on download link with Alex not running
    
            * BrowserDocument.m:
            (-[BrowserDocument _stopNonDownloadingDataSource:]): added
            (-[BrowserDocument close]): calls above
            * WebController.m:
            (-[BrowserWebController haveContentPolicy:andPath:forDataSource:]): moved super call to first line
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1528 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fd71b40..fb57828 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2002-07-10  Chris Blumenberg  <cblu at apple.com>
 
+	Fixes for:
+	2981866 - Download doesn't appear in Downloads window if link was command-clicked
+	2965312 - Download progress not shown when clicking on download link with Alex not running
+
+        * WebView.subproj/IFMainURLHandleClient.mm:
+        (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]): retain
+	the downloadProgressHandler before calling requestContentPolicy as the web controller may be released
+	in requestContentPolicy
+
+2002-07-10  Chris Blumenberg  <cblu at apple.com>
+
         Fix for:
         2976311 - Download fails if you close the window that started the download
         2976308 - Can't navigate in window while download started in that window is in progress
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fd71b40..fb57828 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-07-10  Chris Blumenberg  <cblu at apple.com>
 
+	Fixes for:
+	2981866 - Download doesn't appear in Downloads window if link was command-clicked
+	2965312 - Download progress not shown when clicking on download link with Alex not running
+
+        * WebView.subproj/IFMainURLHandleClient.mm:
+        (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]): retain
+	the downloadProgressHandler before calling requestContentPolicy as the web controller may be released
+	in requestContentPolicy
+
+2002-07-10  Chris Blumenberg  <cblu at apple.com>
+
         Fix for:
         2976311 - Download fails if you close the window that started the download
         2976308 - Can't navigate in window while download started in that window is in progress
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 4e1a20c..97d4db8 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -175,6 +175,12 @@
         
         [dataSource _setContentType:contentType];
         [dataSource _setEncoding:[sender characterSet]];
+        
+        // retain the downloadProgressHandler just in case this is a download.
+        // Alexander releases the WebController if no window is created for it.
+        // This happens in the cases mentioned in 2981866 and 2965312.
+        downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
+        
         [[controller policyHandler] requestContentPolicyForMIMEType:contentType dataSource:dataSource];
         
         WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
@@ -203,7 +209,6 @@
     }
     else if(contentPolicy == IFContentPolicySave || contentPolicy == IFContentPolicySaveAndOpenExternally){
         if(!downloadHandler){
-            downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
             [frame->_private setProvisionalDataSource:nil];
             [[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
             downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 4e1a20c..97d4db8 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -175,6 +175,12 @@
         
         [dataSource _setContentType:contentType];
         [dataSource _setEncoding:[sender characterSet]];
+        
+        // retain the downloadProgressHandler just in case this is a download.
+        // Alexander releases the WebController if no window is created for it.
+        // This happens in the cases mentioned in 2981866 and 2965312.
+        downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
+        
         [[controller policyHandler] requestContentPolicyForMIMEType:contentType dataSource:dataSource];
         
         WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
@@ -203,7 +209,6 @@
     }
     else if(contentPolicy == IFContentPolicySave || contentPolicy == IFContentPolicySaveAndOpenExternally){
         if(!downloadHandler){
-            downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
             [frame->_private setProvisionalDataSource:nil];
             [[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
             downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 4e1a20c..97d4db8 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -175,6 +175,12 @@
         
         [dataSource _setContentType:contentType];
         [dataSource _setEncoding:[sender characterSet]];
+        
+        // retain the downloadProgressHandler just in case this is a download.
+        // Alexander releases the WebController if no window is created for it.
+        // This happens in the cases mentioned in 2981866 and 2965312.
+        downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
+        
         [[controller policyHandler] requestContentPolicyForMIMEType:contentType dataSource:dataSource];
         
         WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
@@ -203,7 +209,6 @@
     }
     else if(contentPolicy == IFContentPolicySave || contentPolicy == IFContentPolicySaveAndOpenExternally){
         if(!downloadHandler){
-            downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
             [frame->_private setProvisionalDataSource:nil];
             [[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
             downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];

-- 
WebKit Debian packaging