[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 be65a7cb24c04c00a90b8387e6206df84af42574
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 16 20:34:42 2003 +0000

    WebFoundation:
    
            Reviewed by David
    
            Added API-approved NSURLCacheStoragePolicy enum.
    
            Removed NSURLProtocolClient.h file. Rolled protocol
            declaration in NSURLProtocol.h
    
            Moved all NSURLProtocolClient implementors to API-approved
            interface.
    
            Did some code reorganization with regard to cached response
            management in NSURLConnection implementation and its interaction
            with NSURLProtocol. This is a partial step towards implementing
            the final API.
    
            Moved some more cacheObject usages in the program text to
            use cachedResponse instead.
    
            Added a number of API FIXME markers to indicate places where
            more work needs to be done to complete the API transition.
    
            * CacheLoader.subproj/NSURLCache.h:
            * CacheLoader.subproj/NSURLConnection.m:
            (-[NSURLConnection cachedResponse]):
            (-[NSURLConnection setCacheObject:]):
            (-[NSURLConnection _chooseCachedResponse]):
            (-[NSURLConnection _beginLoad]):
            (-[NSURLConnection _scheduleOriginLoad]):
            (-[NSURLConnection _prepareOriginLoad]):
            (-[NSURLConnection _beginOriginLoad]):
            (-[NSURLConnection _performTimeOut]):
            (-[NSURLConnection _wasRedirectedToRequest:redirectResponse:]):
            (-[NSURLConnection _didReceiveResponse:cacheStoragePolicy:]):
            (-[NSURLConnection _didLoadData:]):
            (-[NSURLConnection _invalidateCacheObject]):
            (-[NSURLConnection _didFinishLoading]):
            (-[NSURLConnection _didFailWithError:]):
            (-[NSURLConnectionInternal dealloc]):
            (-[NSURLConnectionInternal cachedResponse]):
            (-[NSURLConnectionInternal URLProtocol:wasRedirectedToRequest:redirectResponse:]):
            (-[NSURLConnectionInternal URLProtocol:cachedResponseIsValid:]):
            (-[NSURLConnectionInternal URLProtocol:didReceiveResponse:cacheStoragePolicy:]):
            (-[NSURLConnectionInternal URLProtocol:didLoadData:]):
            (-[NSURLConnectionInternal URLProtocolDidFinishLoading:]):
            (-[NSURLConnectionInternal URLProtocol:didFailWithError:]):
            (-[NSURLConnectionInternal _invalidateCacheObject]):
            (-[NSURLConnectionInternal _setWaitingForCallback:]):
            * CacheLoader.subproj/NSURLProtocol.h:
            * CacheLoader.subproj/NSURLProtocol.m:
            (-[NSURLProtocol initWithRequest:cachedResponse:client:]):
            (-[NSURLProtocol client]):
            (-[NSURLProtocol startLoading]):
            (-[NSURLProtocol _invalidateCacheObject]):
            * CacheLoader.subproj/NSURLProtocolPrivate.h:
            * ProtocolHandlers.subproj/WebAboutProtocol.m:
            (-[WebAboutProtocol startLoading]):
            * ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
            (-[WebCFNetworkHTTPProtocol addAuthenticationFieldsToHeader]):
            (-[WebCFNetworkHTTPProtocol startLoading]):
            (-[WebCFNetworkHTTPProtocol retryAfterAuthenticationFailure:]):
            (-[WebCFNetworkHTTPProtocol retryAfterConnectingToInternet]):
            (-[WebCFNetworkHTTPProtocol continueAfterEndEncountered]):
            (-[WebCFNetworkHTTPProtocol continueHeaderReadAfter3xxResponseAndCall:]):
            (-[WebCFNetworkHTTPProtocol performHTTPHeaderRead:andCall:]):
            (-[WebCFNetworkHTTPProtocol performStreamRead:]):
            (-[WebCFNetworkHTTPProtocol didAddCredentials:toRequest:context:]):
            * ProtocolHandlers.subproj/WebFTPProtocol.m:
            (-[WebFTPProtocol sendResponseAvailableCallback]):
            (-[WebFTPProtocol startLoading]):
            (-[WebFTPProtocol determineErrorAndFail]):
            (-[WebFTPProtocol didLoadData:]):
            (-[WebFTPProtocol handleHasBytesAvailable]):
            (-[WebFTPProtocol _checkDirectoryListing]):
            (-[WebFTPProtocol handleEndEncountered]):
            (-[WebFTPProtocol handleReadStreamEvent:event:]):
            * ProtocolHandlers.subproj/WebFileProtocol.m:
            (-[WebFileProtocol didLoadData:]):
            (-[WebFileProtocol startLoading]):
            * ProtocolHandlers.subproj/WebHTTPProtocol.m:
            (-[WebHTTPProtocol startLoading]):
            (-[WebHTTPProtocol sendResponseAvailableCallback]):
            (-[WebHTTPProtocol failWithError:]):
            (-[WebHTTPProtocol retryWithRedirectedURLAndResultCode:]):
            * ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
            (-[WebSimpleHTTPProtocol startLoading]):
            (-[WebSimpleHTTPProtocol _extractResponseStatusLineFromBytes:length:]):
            (-[WebSimpleHTTPProtocol _processHTTPResultCode]):
            (-[WebSimpleHTTPProtocol _forwardToCFNetwork]):
            (-[WebSimpleHTTPProtocol _handleLoadCallback]):
            * WebFoundation.pbproj/project.pbxproj:
    
    WebKit:
    
            Reviewed by David
    
            Moved this NSURLProtocolClient implementor to API-approved
            interface.
    
            * WebView.subproj/WebDataProtocol.m:
            (-[WebDataProtocol startLoading]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9d96cbc..e894ff9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2003-04-16  Ken Kocienda  <kocienda at apple.com>
 
+        Reviewed by David
+
+        Moved this NSURLProtocolClient implementor to API-approved
+        interface.
+
+        * WebView.subproj/WebDataProtocol.m:
+        (-[WebDataProtocol startLoading]):
+
+2003-04-16  Ken Kocienda  <kocienda at apple.com>
+
         Reviewed by me
 
 	Fix deployment build breaker caused by uninitialized variable.
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 3cf1bb1..70d6460 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -7,7 +7,6 @@
 #import <WebFoundation/NSURLResponse.h>
 #import <WebFoundation/NSURLResponsePrivate.h>
 #import <WebFoundation/WebError.h>
-#import <WebFoundation/NSURLProtocolClient.h>
 
 NSString *WebDataProtocolScheme = @"applewebdata";
 
@@ -142,9 +141,9 @@ NSString *WebDataProtocolScheme = @"applewebdata";
     return URL;
 }
 
-- (void)startLoadingWithCacheObject:(NSCachedURLResponse *)cacheObject
+- (void)startLoading
 {
-    NSObject<NSURLProtocolClient> *client = [self client];
+    id<NSURLProtocolClient> client = [self client];
     NSURLRequest *request = [self request];
     NSData *data = [request _webDataRequestData];
 
@@ -153,16 +152,16 @@ NSString *WebDataProtocolScheme = @"applewebdata";
         [response setURL:[request URL]];
         [response setMIMEType:@"text/html"];
         [response setTextEncodingName:[request _webDataRequestEncoding]];
-        [client responseAvailable:response];
-        [client didLoadBytes:[data bytes] length:[data length]];
-        [client finishedLoading];
+        [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+        [client URLProtocol:self didLoadData:data];
+        [client URLProtocolDidFinishLoading:self];
         [response release];
     } else {
         int resultCode;
 
         resultCode = WebFoundationErrorResourceUnavailable;
 
-        [client failedWithError:[WebError errorWithCode:resultCode inDomain:WebErrorDomainWebFoundation failingURL:[[request URL] absoluteString]]];
+        [client URLProtocol:self didFailWithError:[WebError errorWithCode:resultCode inDomain:WebErrorDomainWebFoundation failingURL:[[request URL] absoluteString]]];
     }
 }
 

-- 
WebKit Debian packaging