[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 fc5dc5464ff834512092c87aa26e41660ff5bbf2
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 1 03:16:57 2003 +0000

    WebFoundation:
    
            Reviewed by Richard
    
    	Add API to NSURLProtocol so that protocol implementors
    	can set the instance variables defined on the base NSURLRequest
    	class. Also modified the existing setters on NSURLRequest
    	by giving them leading underscores, thus marking them
    	more clearly as SPI.
    
            * CacheLoader.subproj/NSURLConnection.m:
            (-[NSURLConnection _didLoadData:]):
            (-[NSURLConnection _didFinishReturnCachedResponse:]):
            (-[NSURLConnection _didFinishLoading]):
            (-[NSURLConnection _didFailWithError:]):
            * CacheLoader.subproj/NSURLProtocol.h:
            * CacheLoader.subproj/NSURLProtocol.m:
            (-[NSURLProtocol setURL:inResponse:]):
            (-[NSURLProtocol setExpectedContentLength:inResponse:]):
            (-[NSURLProtocol setMIMEType:inResponse:]):
            (-[NSURLProtocol setTextEncodingName:inResponse:]):
            * CacheLoader.subproj/NSURLResponse.m:
            (-[NSURLResponse _setURL:]):
            (-[NSURLResponse _setExpectedContentLength:]):
            (-[NSURLResponse _setMIMEType:]):
            (-[NSURLResponse _setTextEncodingName:]):
            * CacheLoader.subproj/NSURLResponsePrivate.h:
            * ProtocolHandlers.subproj/WebAboutProtocol.m:
            (-[WebAboutProtocol startLoading]):
            * ProtocolHandlers.subproj/WebFTPProtocol.m:
            (-[WebFTPProtocol sendResponseAvailableCallback]):
            * ProtocolHandlers.subproj/WebFileProtocol.m:
            (-[WebFileProtocol didLoadData:]):
            * ProtocolHandlers.subproj/WebHTTPProtocol.m:
            (-[WebHTTPProtocol HTTPResponse]):
    
    WebKit:
    
            Reviewed by Richard
    
    	Use NSURLResponse new SPI methods to set instance variables.
    
            * WebView.subproj/WebBaseResourceHandleDelegate.m:
            (-[WebBaseResourceHandleDelegate connection:didReceiveResponse:]):
            * WebView.subproj/WebDataProtocol.m:
            (-[WebDataProtocol startLoading]):
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient loadWithRequest:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4238 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 36ca65b..e848dad 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-04-30  Kenneth Kocienda  <kocienda at apple.com>
+
+        Reviewed by Richard
+
+	Use NSURLResponse new SPI methods to set instance variables.
+
+        * WebView.subproj/WebBaseResourceHandleDelegate.m:
+        (-[WebBaseResourceHandleDelegate connection:didReceiveResponse:]):
+        * WebView.subproj/WebDataProtocol.m:
+        (-[WebDataProtocol startLoading]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient loadWithRequest:]):
+
 2003-04-30  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Richard.
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 80b36e8..2c1414d 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -256,9 +256,9 @@
     if([WebDataProtocol _webIsDataProtocolURL:[r URL]]) {
         NSURL *baseURL = [request _webDataRequestBaseURL];
         if (baseURL)
-            [r setURL: baseURL];
+            [r _setURL: baseURL];
         else
-            [r setURL: [NSURL URLWithString: @"about:blank"]];
+            [r _setURL: [NSURL URLWithString: @"about:blank"]];
     }
 
     [r retain];
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 0cb2b32..95ceaf4 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -183,9 +183,9 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
 
     if (data) {
         NSURLResponse *response = [[NSURLResponse alloc] init];
-        [response setURL:[request URL]];
-        [response setMIMEType:[request _webDataRequestMIMEType]];
-        [response setTextEncodingName:[request _webDataRequestEncoding]];
+        [response _setURL:[request URL]];
+        [response _setMIMEType:[request _webDataRequestMIMEType]];
+        [response _setTextEncodingName:[request _webDataRequestEncoding]];
         [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
         [client URLProtocol:self didLoadData:data];
         [client URLProtocolDidFinishLoading:self];
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 80b36e8..2c1414d 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -256,9 +256,9 @@
     if([WebDataProtocol _webIsDataProtocolURL:[r URL]]) {
         NSURL *baseURL = [request _webDataRequestBaseURL];
         if (baseURL)
-            [r setURL: baseURL];
+            [r _setURL: baseURL];
         else
-            [r setURL: [NSURL URLWithString: @"about:blank"]];
+            [r _setURL: [NSURL URLWithString: @"about:blank"]];
     }
 
     [r retain];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 5eb3bf9..a6bf0ed 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -295,9 +295,9 @@
 	[self connection:connection willSendRequest:r redirectResponse:nil];
 
 	NSURLResponse *rsp = [[NSURLResponse alloc] init];
-	[rsp setURL:[[[self dataSource] request] URL]];
-	[rsp setMIMEType:@"text/html"];
-	[rsp setExpectedContentLength:0];
+	[rsp _setURL:[[[self dataSource] request] URL]];
+	[rsp _setMIMEType:@"text/html"];
+	[rsp _setExpectedContentLength:0];
 	[self connection:connection didReceiveResponse:rsp];
 	[rsp release];
     } else {
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 5eb3bf9..a6bf0ed 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -295,9 +295,9 @@
 	[self connection:connection willSendRequest:r redirectResponse:nil];
 
 	NSURLResponse *rsp = [[NSURLResponse alloc] init];
-	[rsp setURL:[[[self dataSource] request] URL]];
-	[rsp setMIMEType:@"text/html"];
-	[rsp setExpectedContentLength:0];
+	[rsp _setURL:[[[self dataSource] request] URL]];
+	[rsp _setMIMEType:@"text/html"];
+	[rsp _setExpectedContentLength:0];
 	[self connection:connection didReceiveResponse:rsp];
 	[rsp release];
     } else {

-- 
WebKit Debian packaging