[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 7c3a98437f8bdc692ab07b57bae60baef0acaa15
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 22 22:37:55 2002 +0000

            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:didReceiveResponse:]):
    	Send the new error whenever a policy change happens. The old code was
    	sending a successful completion in the download and ignore cases.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0fcb43a..ffc0a9f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-22  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+	Send the new error whenever a policy change happens. The old code was
+	sending a successful completion in the download and ignore cases.
+
 2002-10-22  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3080873 -- Error in console when no bookmark file 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0fcb43a..ffc0a9f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-22  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+	Send the new error whenever a policy change happens. The old code was
+	sending a successful completion in the download and ignore cases.
+
 2002-10-22  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3080873 -- Error in console when no bookmark file 
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 0aa0bc9..c9e7b8e 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -271,7 +271,7 @@
     case WebContentPolicySave:
     case WebContentPolicySaveAndOpenExternally:
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-        [[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
         WebError *downloadError = [downloadHandler receivedResponse:response];
         [downloadProgressDelegate resource: identifier didReceiveResponse: response fromDataSource: dataSource];
@@ -285,7 +285,7 @@
         [handle cancel];
         [self didCancelWithHandle:handle];
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-	[[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         break;
     default:
         ERROR("contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy.");
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 0aa0bc9..c9e7b8e 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -271,7 +271,7 @@
     case WebContentPolicySave:
     case WebContentPolicySaveAndOpenExternally:
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-        [[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
         WebError *downloadError = [downloadHandler receivedResponse:response];
         [downloadProgressDelegate resource: identifier didReceiveResponse: response fromDataSource: dataSource];
@@ -285,7 +285,7 @@
         [handle cancel];
         [self didCancelWithHandle:handle];
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-	[[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         break;
     default:
         ERROR("contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy.");

-- 
WebKit Debian packaging