[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 227bb82ec3eb9e13cd0a5c1cf8a2db9115d8acec
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 1 23:31:43 2002 +0000

    i        * WebView.subproj/IFMainURLHandleClient.mm:
            (-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
            Ensure that _didStopLoading is called for both error case and
            non-error case.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1488 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c7ee200..8dfe20e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,13 @@
 
         * WebView.subproj/IFMainURLHandleClient.mm:
         (-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+        Ensure that _didStopLoading is called for both error case and
+        non-error case.
+
+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.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c7ee200..8dfe20e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -2,6 +2,13 @@
 
         * WebView.subproj/IFMainURLHandleClient.mm:
         (-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+        Ensure that _didStopLoading is called for both error case and
+        non-error case.
+
+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.
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 5907a85..57e94da 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -93,6 +93,7 @@
     if([dataSource contentPolicy] == IFContentPolicyShow)
         [[dataSource representation] finishedLoadingWithDataSource:dataSource];
     
+    // Either send a final error message or a final progress message.
     IFError *nonTerminalError = [sender error];
     if (nonTerminalError){
         [[dataSource controller] _mainReceivedError:nonTerminalError forResourceHandle:sender partialProgress:[IFLoadProgress progressWithURLHandle:sender] fromDataSource:dataSource];
@@ -101,8 +102,8 @@
         // update progress
         [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
                 forResourceHandle:sender fromDataSource:dataSource complete:YES];
-        [[dataSource controller] _didStopLoading:url];
     }
+    [[dataSource controller] _didStopLoading:url];
 
     [url release];
     url = nil;    
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 5907a85..57e94da 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -93,6 +93,7 @@
     if([dataSource contentPolicy] == IFContentPolicyShow)
         [[dataSource representation] finishedLoadingWithDataSource:dataSource];
     
+    // Either send a final error message or a final progress message.
     IFError *nonTerminalError = [sender error];
     if (nonTerminalError){
         [[dataSource controller] _mainReceivedError:nonTerminalError forResourceHandle:sender partialProgress:[IFLoadProgress progressWithURLHandle:sender] fromDataSource:dataSource];
@@ -101,8 +102,8 @@
         // update progress
         [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
                 forResourceHandle:sender fromDataSource:dataSource complete:YES];
-        [[dataSource controller] _didStopLoading:url];
     }
+    [[dataSource controller] _didStopLoading:url];
 
     [url release];
     url = nil;    
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 5907a85..57e94da 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -93,6 +93,7 @@
     if([dataSource contentPolicy] == IFContentPolicyShow)
         [[dataSource representation] finishedLoadingWithDataSource:dataSource];
     
+    // Either send a final error message or a final progress message.
     IFError *nonTerminalError = [sender error];
     if (nonTerminalError){
         [[dataSource controller] _mainReceivedError:nonTerminalError forResourceHandle:sender partialProgress:[IFLoadProgress progressWithURLHandle:sender] fromDataSource:dataSource];
@@ -101,8 +102,8 @@
         // update progress
         [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
                 forResourceHandle:sender fromDataSource:dataSource complete:YES];
-        [[dataSource controller] _didStopLoading:url];
     }
+    [[dataSource controller] _didStopLoading:url];
 
     [url release];
     url = nil;    

-- 
WebKit Debian packaging