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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit f85d568fad11cd547a5420ba4da5cf8f8f257c48
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 5 21:04:42 2002 +0000

    WebFoundation:
    
    	Another change likes the ones I have been doing.
    
    	This time the WebError object has been removed from WebResourceHandle and WebResourceLoad.
    	They now rely on the WebError object in WebResourceResponse. All WebFoundation code
    	has been updated accordingly.
    
            * CacheLoader.subproj/IFURLHandleC.m:
            (IFURLHandleBackgroundLoadFailedWithResultCode)
            (IFURLHandleGetError)
            * CacheLoader.subproj/WebCFNetworkHTTPProtocolHandler.m:
            (-[WebCFNetworkHTTPProtocolHandler continueHeaderReadAfterFailureResponseAndCall:])
            * CacheLoader.subproj/WebResourceHandle.h:
            * CacheLoader.subproj/WebResourceHandle.m:
            * CacheLoader.subproj/WebResourceHandleInternal.h:
            * CacheLoader.subproj/WebResourceHandleInternal.m:
            (-[WebResourceHandleInstanceVariables dealloc])
            (-[WebResourceHandle _notifyClientDidFailLoading])
            * CacheLoader.subproj/WebResourceHandlePrivate.h:
            * CacheLoader.subproj/WebResourceHandlePrivate.m:
            * CacheLoader.subproj/WebResourceLoad.h:
            * CacheLoader.subproj/WebResourceLoad.m:
            (-[WebResourceLoad succeeded])
            (-[WebResourceLoad failedWithResultCode:inDomain:failingURL:isTerminal:])
            (-[WebResourceLoad dealloc])
            * CacheLoader.subproj/WebSimpleHTTPProtocolHandler.m:
            (-[WebSimpleHTTPProtocolHandler _examineHeaders])
    
    WebKit:
    
    	The WebError object has been removed from WebResourceHandle.
            Objects of that class now rely on the WebError object in WebResourceResponse.
    
    	This code has been updated to ask WebResourceResponse for it WebError object,
    	rather than asking WebResourceHandle.
    
            * WebCoreSupport.subproj/WebSubresourceClient.m:
            (-[WebSubresourceClient handleDidFinishLoading:])
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handleDidFinishLoading:])
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0efd46b..fe066f2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-09-05  Ken Kocienda  <kocienda at apple.com>
+
+	The WebError object has been removed from WebResourceHandle.
+        Objects of that class now rely on the WebError object in WebResourceResponse. 
+
+	This code has been updated to ask WebResourceResponse for it WebError object,
+	rather than asking WebResourceHandle.
+
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (-[WebSubresourceClient handleDidFinishLoading:])
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidFinishLoading:])
+
 2002-09-05  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed 3021365 - Crash failing to load plugin from local file
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0efd46b..fe066f2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-09-05  Ken Kocienda  <kocienda at apple.com>
+
+	The WebError object has been removed from WebResourceHandle.
+        Objects of that class now rely on the WebError object in WebResourceResponse. 
+
+	This code has been updated to ask WebResourceResponse for it WebError object,
+	rather than asking WebResourceHandle.
+
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (-[WebSubresourceClient handleDidFinishLoading:])
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidFinishLoading:])
+
 2002-09-05  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed 3021365 - Crash failing to load plugin from local file
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index e667f3d..2588a72 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -140,7 +140,7 @@
     
     [dataSource _removeResourceHandle:handle];
     
-    WebError *nonTerminalError = [handle error];
+    WebError *nonTerminalError = [[handle response] error];
     if (nonTerminalError) {
         [self receivedError:nonTerminalError forHandle:handle];
     }
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index e667f3d..2588a72 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -140,7 +140,7 @@
     
     [dataSource _removeResourceHandle:handle];
     
-    WebError *nonTerminalError = [handle error];
+    WebError *nonTerminalError = [[handle response] error];
     if (nonTerminalError) {
         [self receivedError:nonTerminalError forHandle:handle];
     }
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 72bf7b0..bdd9f17 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -158,7 +158,7 @@
     }
     
     // Either send a final error message or a final progress message.
-    WebError *nonTerminalError = [handle error];
+    WebError *nonTerminalError = [[handle response] error];
     if (nonTerminalError) {
         [self receivedError:nonTerminalError forHandle:handle];
     } else {
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 72bf7b0..bdd9f17 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -158,7 +158,7 @@
     }
     
     // Either send a final error message or a final progress message.
-    WebError *nonTerminalError = [handle error];
+    WebError *nonTerminalError = [[handle response] error];
     if (nonTerminalError) {
         [self receivedError:nonTerminalError forHandle:handle];
     } else {

-- 
WebKit Debian packaging