[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 9e300bdf0e42768ee933eb5c9861fa2cc7fdf7ef
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 22 23:48:20 2003 +0000

    WebFoundation:
    
            Reviewed by Darin
    
            Updated to use API-approved methods for accessing
            protocol-specific URL request data.
    
            Changed use of NSURLProtocol registeredClasses method to
            _registeredClasses to reflect that that this method
            is no longer API, but is available as SPI.
    
            * CacheLoader.subproj/NSURLProtocol.h:
            * CacheLoader.subproj/NSURLProtocol.m:
            (+[NSURLProtocol propertyForKey:inRequest:]):
            (+[NSURLProtocol setProperty:forKey:inRequest:]):
            (+[NSURLProtocol _registeredClasses]):
            * CacheLoader.subproj/NSURLProtocolPrivate.h:
            * CacheLoader.subproj/NSURLRequest.m:
            (-[NSURLRequestInternal dealloc]):
            (-[NSURLRequest hash]):
            (-[NSURLRequest isEqual:]):
            (-[NSURLRequest mutableCopyWithZone:]):
            (-[NSURLRequest _copyReplacingURLWithURL:]):
            (-[NSURLRequest _propertyForKey:]):
            (-[NSURLRequest _setProperty:forKey:]):
            (-[NSMutableURLRequest copyWithZone:]):
            (-[NSMutableURLRequest _copyReplacingURLWithURL:]):
            (-[NSURLRequest _parametersForReading]):
            (-[NSURLRequest HTTPMethod]):
            (-[NSURLRequest HTTPAllHeaderFields]):
            (-[NSURLRequest HTTPValueForHeaderField:]):
            (-[NSURLRequest HTTPBody]):
            (-[NSURLRequest HTTPAllowSSLCertificatesWithUnknownRoots]):
            (-[NSURLRequest HTTPCookiePolicyBaseURL]):
            (-[NSURLRequest HTTPExtraCookies]):
            (-[NSURLRequest HTTPPageNotFoundCacheLifetime]):
            (-[NSMutableURLRequest _parametersForWriting]):
            (-[NSMutableURLRequest HTTPSetMethod:]):
            (-[NSMutableURLRequest HTTPSetAllHeaderFields:]):
            (-[NSMutableURLRequest HTTPSetValue:forHeaderField:]):
            (-[NSMutableURLRequest HTTPAddValue:forHeaderField:]):
            (-[NSMutableURLRequest HTTPSetBody:]):
            (-[NSMutableURLRequest HTTPSetAllowSSLCertificatesWithUnknownRoots:]):
            (-[NSMutableURLRequest HTTPSetCookiePolicyBaseURL:]):
            (-[NSMutableURLRequest HTTPSetExtraCookies:]):
            (-[NSMutableURLRequest HTTPSetPageNotFoundCacheLifetime:]):
            (-[NSHTTPURLRequestRequestParameters copyWithZone:]):
            (-[NSHTTPURLRequestRequestParameters mutableCopyWithZone:]):
            * CacheLoader.subproj/NSURLRequestPrivate.h:
            * WebFoundation.pbproj/project.pbxproj:
    
    WebKit:
    
            Reviewed by Darin
    
    	Updated to use API-approved methods for accessing
    	protocol-specific URL request data.
    
            * WebView.subproj/WebDataProtocol.m:
            (-[NSURLRequest _webDataRequestParametersForReading]):
            (-[NSURLRequest _webDataRequestParametersForWriting]):
    
    WebBrowser:
    
            Reviewed by Darin
    
            Changed use of NSURLProtocol registeredClasses method to
            _registeredClasses to reflect that that this method
            is no longer API, but is available as SPI.
    
            * Debug/DebugUtilities.m:
            (initProtocolHandlers):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4154 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 867518f..73351da 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-22  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+	Updated to use API-approved methods for accessing 
+	protocol-specific URL request data.
+
+        * WebView.subproj/WebDataProtocol.m:
+        (-[NSURLRequest _webDataRequestParametersForReading]):
+        (-[NSURLRequest _webDataRequestParametersForWriting]):
+
 2003-04-22  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 7c77f91..488e025 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -11,6 +11,7 @@
 #import <WebFoundation/WebAssertions.h>
 
 NSString *WebDataProtocolScheme = @"applewebdata";
+static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
 
 @interface WebDataRequestParameters : NSObject <NSCopying>
 {
@@ -63,14 +64,17 @@ NSString *WebDataProtocolScheme = @"applewebdata";
 
 - (WebDataRequestParameters *)_webDataRequestParametersForReading
 {
-    Class theClass = [WebDataRequestParameters class];
-    return [NSURLProtocol partOfRequest:self withClass:theClass createIfDoesNotExist:NO];
+    return [NSURLProtocol propertyForKey:WebDataRequestPropertyKey inRequest:self];
 }
 
 - (WebDataRequestParameters *)_webDataRequestParametersForWriting
 {
-    Class theClass = [WebDataRequestParameters class];
-    return [NSURLProtocol partOfRequest:self withClass:theClass createIfDoesNotExist:YES];
+    WebDataRequestParameters *result = [NSURLProtocol propertyForKey:WebDataRequestPropertyKey inRequest:self];
+    if (!result) {
+        result = [[WebDataRequestParameters alloc] init];
+        [NSURLProtocol setProperty:result forKey:WebDataRequestPropertyKey inRequest:self];
+    }
+    return result;
 }
 
 - (NSData *)_webDataRequestData

-- 
WebKit Debian packaging