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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 2ac8f7f0c481d7c77b6f503b48809c40a862ad6a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 1 23:07:43 2002 +0000

            * WebView.subproj/IFMainURLHandleClient.mm:
            (-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
            A completion message was being sent, as well as an error message.
            This, no doubt confused Alexander.  No only send either the final
            error message or the completion message.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1487 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e23bea4..c7ee200 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-01  Richard Williamson  <rjw at apple.com>
+
+        * WebView.subproj/IFMainURLHandleClient.mm:
+        (-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+        A completion message was being sent, as well as an error message.
+        This, no doubt confused Alexander.  No only send either the final
+        error message or the completion message.
+
 2002-07-01  Darin Adler  <darin at apple.com>
 
 	Ken fixed the load message sequencing problem in WebFoundation, so now we can
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e23bea4..c7ee200 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-07-01  Richard Williamson  <rjw at apple.com>
+
+        * WebView.subproj/IFMainURLHandleClient.mm:
+        (-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+        A completion message was being sent, as well as an error message.
+        This, no doubt confused Alexander.  No only send either the final
+        error message or the completion message.
+
 2002-07-01  Darin Adler  <darin at apple.com>
 
 	Ken fixed the load message sequencing problem in WebFoundation, so now we can
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 715a345..5907a85 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -93,17 +93,19 @@
     if([dataSource contentPolicy] == IFContentPolicyShow)
         [[dataSource representation] finishedLoadingWithDataSource:dataSource];
     
-    // update progress
-    [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle:sender fromDataSource:dataSource complete:YES];
-    [[dataSource controller] _didStopLoading:url];
-    [url release];
-    url = nil;
-    
     IFError *nonTerminalError = [sender error];
     if (nonTerminalError){
         [[dataSource controller] _mainReceivedError:nonTerminalError forResourceHandle:sender partialProgress:[IFLoadProgress progressWithURLHandle:sender] fromDataSource:dataSource];
     }
+    else {
+        // update progress
+        [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+                forResourceHandle:sender fromDataSource:dataSource complete:YES];
+        [[dataSource controller] _didStopLoading:url];
+    }
+
+    [url release];
+    url = nil;    
     
     [downloadHandler finishedLoading];
     [downloadHandler release];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 715a345..5907a85 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -93,17 +93,19 @@
     if([dataSource contentPolicy] == IFContentPolicyShow)
         [[dataSource representation] finishedLoadingWithDataSource:dataSource];
     
-    // update progress
-    [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle:sender fromDataSource:dataSource complete:YES];
-    [[dataSource controller] _didStopLoading:url];
-    [url release];
-    url = nil;
-    
     IFError *nonTerminalError = [sender error];
     if (nonTerminalError){
         [[dataSource controller] _mainReceivedError:nonTerminalError forResourceHandle:sender partialProgress:[IFLoadProgress progressWithURLHandle:sender] fromDataSource:dataSource];
     }
+    else {
+        // update progress
+        [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+                forResourceHandle:sender fromDataSource:dataSource complete:YES];
+        [[dataSource controller] _didStopLoading:url];
+    }
+
+    [url release];
+    url = nil;    
     
     [downloadHandler finishedLoading];
     [downloadHandler release];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 715a345..5907a85 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -93,17 +93,19 @@
     if([dataSource contentPolicy] == IFContentPolicyShow)
         [[dataSource representation] finishedLoadingWithDataSource:dataSource];
     
-    // update progress
-    [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle:sender fromDataSource:dataSource complete:YES];
-    [[dataSource controller] _didStopLoading:url];
-    [url release];
-    url = nil;
-    
     IFError *nonTerminalError = [sender error];
     if (nonTerminalError){
         [[dataSource controller] _mainReceivedError:nonTerminalError forResourceHandle:sender partialProgress:[IFLoadProgress progressWithURLHandle:sender] fromDataSource:dataSource];
     }
+    else {
+        // update progress
+        [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+                forResourceHandle:sender fromDataSource:dataSource complete:YES];
+        [[dataSource controller] _didStopLoading:url];
+    }
+
+    [url release];
+    url = nil;    
     
     [downloadHandler finishedLoading];
     [downloadHandler release];

-- 
WebKit Debian packaging