[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 98fff8ef2bdff351d0c984ede010666ff3dd2998
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 1 17:49:39 2002 +0000

    WebFoundation:
    
    	Reorganization of code in WebResourceResponse. This moves the code to the
    	point where the next change will be to break out HTTP-specific response
    	information into its own subclass.
    
            * CacheLoader.subproj/WebResourceLoad.m:
            (-[WebResourceLoad initWithRequest:]): Call protocol handler to get the right class
    	for the response.
            (-[WebResourceLoad succeeded]):
            * CacheLoader.subproj/WebResourceResponse.h:
            * CacheLoader.subproj/WebResourceResponse.m:
            (-[WebResourceResponse init]):
            (-[WebResourceResponse initWithCoder:]):
            (-[WebResourceResponse encodeWithCoder:]):
            (-[WebResourceResponse textEncodingName]): Changed name from characterSet.
            (-[WebResourceResponse userAgent]):
            (-[WebResourceResponse headers]):
            (-[WebResourceResponse resultCode]):
            (-[WebResourceResponse _resourceData]):
            (-[WebResourceResponse _setTextEncodingName:]): Changed name from _setCharacterSet:.
            (-[WebResourceResponse _takePersistentValuesFrom:]):
            (-[WebResourceResponse dealloc]):
            * CacheLoader.subproj/WebResourceResponsePrivate.h:
            * ProtocolHandlers.subproj/WebHTTPProtocolHandler.m:
            (-[WebHTTPProtocolHandler setResponseMetadata:]):
    
    WebKit:
    
            * WebCoreSupport.subproj/WebSubresourceClient.m:
            (-[WebSubresourceClient handleDidFinishLoading:]): Fixed Development build breakage. Call to [response statusCode]
    	now calls the handle's private method to get the status code.
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handleDidFinishLoading:]): Ditto.
            (-[WebMainResourceClient handle:didReceiveData:]): Calls new textEncodingName method, replacing call to characterSet.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2217 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a4ee2a3..ddda012 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-10-01  Ken Kocienda  <kocienda at apple.com>
 
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (-[WebSubresourceClient handleDidFinishLoading:]): Fixed Development build breakage. Call to [response statusCode] 
+	now calls the handle's private method to get the status code.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidFinishLoading:]): Ditto.
+        (-[WebMainResourceClient handle:didReceiveData:]): Calls new textEncodingName method, replacing call to characterSet.
+
+2002-10-01  Ken Kocienda  <kocienda at apple.com>
+
         * WebView.subproj/WebLoadProgress.m:
         (-[WebLoadProgress initWithResourceHandle:]): Status code moved from WebResourceResponse
 	to WebResourceHandle private API.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a4ee2a3..ddda012 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-10-01  Ken Kocienda  <kocienda at apple.com>
 
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (-[WebSubresourceClient handleDidFinishLoading:]): Fixed Development build breakage. Call to [response statusCode] 
+	now calls the handle's private method to get the status code.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidFinishLoading:]): Ditto.
+        (-[WebMainResourceClient handle:didReceiveData:]): Calls new textEncodingName method, replacing call to characterSet.
+
+2002-10-01  Ken Kocienda  <kocienda at apple.com>
+
         * WebView.subproj/WebLoadProgress.m:
         (-[WebLoadProgress initWithResourceHandle:]): Status code moved from WebResourceResponse
 	to WebResourceHandle private API.
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 730bc32..8b04964 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -153,7 +153,7 @@
 {
     ASSERT(handle == h);
     ASSERT([currentURL isEqual:[[handle _request] canonicalURL]]);
-    ASSERT([response statusCode] == WebResourceHandleStatusLoadComplete);
+    ASSERT([h _statusCode] == WebResourceHandleStatusLoadComplete);
 
     // Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
     [self retain];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 730bc32..8b04964 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -153,7 +153,7 @@
 {
     ASSERT(handle == h);
     ASSERT([currentURL isEqual:[[handle _request] canonicalURL]]);
-    ASSERT([response statusCode] == WebResourceHandleStatusLoadComplete);
+    ASSERT([h _statusCode] == WebResourceHandleStatusLoadComplete);
 
     // Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
     [self retain];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 353ee84..1642fe3 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -160,7 +160,7 @@
     LOG(Loading, "URL = %@", [[handle _request] URL]);
     
     ASSERT([currentURL isEqual:[[handle _request] URL]]);
-    ASSERT([response statusCode] == WebResourceHandleStatusLoadComplete);
+    ASSERT([handle _statusCode] == WebResourceHandleStatusLoadComplete);
 
     // Calling receivedError will likely result in a call to release, so we must retain.
     [self retain];
@@ -241,7 +241,7 @@
             contentType = @"text/html";
         
         [dataSource _setContentType:contentType];
-        [dataSource _setEncoding:[response characterSet]];
+        [dataSource _setEncoding:[response textEncodingName]];
         
         // retain the downloadProgressDelegate just in case this is a download.
         // Alexander releases the WebController if no window is created for it.
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 353ee84..1642fe3 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -160,7 +160,7 @@
     LOG(Loading, "URL = %@", [[handle _request] URL]);
     
     ASSERT([currentURL isEqual:[[handle _request] URL]]);
-    ASSERT([response statusCode] == WebResourceHandleStatusLoadComplete);
+    ASSERT([handle _statusCode] == WebResourceHandleStatusLoadComplete);
 
     // Calling receivedError will likely result in a call to release, so we must retain.
     [self retain];
@@ -241,7 +241,7 @@
             contentType = @"text/html";
         
         [dataSource _setContentType:contentType];
-        [dataSource _setEncoding:[response characterSet]];
+        [dataSource _setEncoding:[response textEncodingName]];
         
         // retain the downloadProgressDelegate just in case this is a download.
         // Alexander releases the WebController if no window is created for it.

-- 
WebKit Debian packaging