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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 4d7baba1c650e8e93c2fcd687e548c15a5cb29fe
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 11 05:26:50 2002 +0000

    	- fixed 3124081 -- REGRESSION: partial progress is left in address field after download
    
            Reviewed by Chris.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient interruptForPolicyChangeAndKeepLoading:]):
    	Put in code to call the locationChangeDone: method on the location change delegate if
    	keepLoading is YES. Since the data source is not finished loading WebFrame won't do it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2994 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 60f89f0..9c3d9c6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-12-10  Darin Adler  <darin at apple.com>
+
+	- fixed 3124081 -- REGRESSION: partial progress is left in address field after download
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient interruptForPolicyChangeAndKeepLoading:]):
+	Put in code to call the locationChangeDone: method on the location change delegate if
+	keepLoading is YES. Since the data source is not finished loading WebFrame won't do it.
+
 2002-12-10  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3124079 - REGRESSION: Downloads never complete
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 43a3ed8..83cdeaa 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -105,6 +105,16 @@
     // Must call receivedError before _clearProvisionalDataSource because
     // if we remove the data source from the frame, we can't get back to the frame any more.
     [self receivedError:interruptError complete:!keepLoading];
+
+    // Deliver the error to the location change delegate.
+    // We have to do this explicitly because since we are still loading, WebFrame
+    // won't do it for us. There's probably a better way to do this, but this should
+    // do for now.
+    if (keepLoading) {
+        [[[dataSource controller] locationChangeDelegate]
+            locationChangeDone:interruptError forDataSource:dataSource];
+    }
+	
     [[dataSource webFrame] _clearProvisionalDataSource];
     
     [self notifyDelegatesOfInterruptionByPolicyChange];
@@ -180,8 +190,8 @@
 	
 	if ([dataSource downloadPath] == nil) {
             // FIXME: Should this be the filename or path?
-	    NSString *saveFilename = [[[dataSource controller] policyDelegate] saveFilenameForResponse:r
-                                                                                            andRequest:req];
+	    NSString *saveFilename = [[[dataSource controller] policyDelegate]
+                saveFilenameForResponse:r andRequest:req];
             // FIXME: Maybe there a cleaner way handle the bad filename case?
             if(!saveFilename || [saveFilename length] == 0){
                 saveFilename = NSHomeDirectory();
@@ -190,7 +200,7 @@
 	}
 
         [self interruptForPolicyChangeAndKeepLoading:YES];
-	
+        
 	// Hand off the dataSource to the download handler.  This will cause the remaining
 	// handle delegate callbacks to go to the controller's download delegate.
 	downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 43a3ed8..83cdeaa 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -105,6 +105,16 @@
     // Must call receivedError before _clearProvisionalDataSource because
     // if we remove the data source from the frame, we can't get back to the frame any more.
     [self receivedError:interruptError complete:!keepLoading];
+
+    // Deliver the error to the location change delegate.
+    // We have to do this explicitly because since we are still loading, WebFrame
+    // won't do it for us. There's probably a better way to do this, but this should
+    // do for now.
+    if (keepLoading) {
+        [[[dataSource controller] locationChangeDelegate]
+            locationChangeDone:interruptError forDataSource:dataSource];
+    }
+	
     [[dataSource webFrame] _clearProvisionalDataSource];
     
     [self notifyDelegatesOfInterruptionByPolicyChange];
@@ -180,8 +190,8 @@
 	
 	if ([dataSource downloadPath] == nil) {
             // FIXME: Should this be the filename or path?
-	    NSString *saveFilename = [[[dataSource controller] policyDelegate] saveFilenameForResponse:r
-                                                                                            andRequest:req];
+	    NSString *saveFilename = [[[dataSource controller] policyDelegate]
+                saveFilenameForResponse:r andRequest:req];
             // FIXME: Maybe there a cleaner way handle the bad filename case?
             if(!saveFilename || [saveFilename length] == 0){
                 saveFilename = NSHomeDirectory();
@@ -190,7 +200,7 @@
 	}
 
         [self interruptForPolicyChangeAndKeepLoading:YES];
-	
+        
 	// Hand off the dataSource to the download handler.  This will cause the remaining
 	// handle delegate callbacks to go to the controller's download delegate.
 	downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];

-- 
WebKit Debian packaging