[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 8140df50341b303763dff5ff48e954ac5f79528c
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 30 18:20:08 2003 +0000

    Tests:
    
            Reviewed by Darin
    
    	Changed cookie-related class names:
    
    	WebCookie -> NSHTTPCookie
    	WebCookiePrivate -> NSHTTPCookieInternal
    	WebCookieManager -> NSHTTPCookieStorage
    	WebCookieManagerPrivate -> NSHTTPCookieStorageInternal
    
            * CookieManager/wkcookie-test.m:
            (DumpIFCookie):
            (main):
            * CookieManager/wkcookiemanager-test.m:
            (main):
    
    WebFoundation:
    
            Reviewed by Darin
    
            Changed cookie-related class names:
    
            WebCookie -> NSHTTPCookie
            WebCookiePrivate -> NSHTTPCookieInternal
            WebCookieManager -> NSHTTPCookieStorage
            WebCookieManagerPrivate -> NSHTTPCookieStorageInternal
    
            * CookieManager.subproj/NSHTTPCookie.h:
            * CookieManager.subproj/NSHTTPCookie.m:
            (+[NSHTTPCookie cookieWithDictionary:]):
            (setVersion):
            (setName):
            (setValue):
            (setDefaultsFromOriginURL):
            (setDomain):
            (setPath):
            (setSecure):
            (setExpires):
            (-[NSHTTPCookie initWithDictionary:]):
            (+[NSHTTPCookie cookieWithV0Spec:forURL:locationHeader:]):
            (+[NSHTTPCookie _cookieArrayFromResponseHeaders:forURL:]):
            (-[NSHTTPCookie compare:]):
            (-[NSHTTPCookie _compareForHeaderOrder:]):
            * CookieManager.subproj/NSHTTPCookiePrivate.h:
            * CookieManager.subproj/NSHTTPCookieStorage.h:
            * CookieManager.subproj/NSHTTPCookieStorage.m:
            (acceptCookiesChanged):
            (setUpOnLoadThread):
            (-[NSHTTPCookieStorage _setCookies:forURL:policyBaseURL:]):
            (-[NSHTTPCookieStorage _internalInit]):
            (-[NSHTTPCookieStorage _cookieRequestHeaderFieldsForURL:withExtraCookies:]):
            (initSharedCookieManager):
            (+[NSHTTPCookieStorage sharedCookieManager]):
            (-[NSHTTPCookieStorage setCookie:]):
            (-[NSHTTPCookieStorage deleteCookie:]):
            (-[NSHTTPCookieStorage setCookiesFromResponseHeader:forURL:policyBaseURL:]):
            * CookieManager.subproj/NSHTTPCookieStoragePrivate.h:
            * CookieManager.subproj/WebCookieStorage.m:
            (-[WebCookieStorage cookiesMatchingDomain:path:secure:]):
            * CookieManager.subproj/WebCookieStorageServer.m:
            (-[WebCookieStorageServer _checkForCookieExpiration:]):
            (-[WebCookieStorageServer _saveCookies]):
            (-[WebCookieStorageServer _setCookiesWithoutSaving:]):
            (-[WebCookieStorageServer deleteCookies:]):
            (makeCookie):
            * ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
            (-[WebCFNetworkHTTPProtocol addCookieFieldToHeader]):
            (-[WebCFNetworkHTTPProtocol setResponseHeaderUsingHTTPResponse:andCall:context:]):
            * ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
            (-[WebSimpleHTTPProtocol buildHTTPRequest]):
            (-[WebSimpleHTTPProtocol _parseHeaderFromData:]):
            * WebFoundation-base.exp:
    
    WebKit:
    
            Reviewed by Darin
    
            Changed cookie-related class names:
    
            WebCookie -> NSHTTPCookie
            WebCookiePrivate -> NSHTTPCookieInternal
            WebCookieManager -> NSHTTPCookieStorage
            WebCookieManagerPrivate -> NSHTTPCookieStorageInternal
    
            * WebCoreSupport.subproj/WebCookieAdapter.m:
            (-[WebCookieAdapter cookiesEnabled]):
            (-[WebCookieAdapter cookiesForURL:]):
            (-[WebCookieAdapter setCookies:forURL:policyBaseURL:]):
    
    WebBrowser:
    
            Reviewed by Darin
    
            Changed cookie-related class names:
    
            WebCookie -> NSHTTPCookie
            WebCookiePrivate -> NSHTTPCookieInternal
            WebCookieManager -> NSHTTPCookieStorage
            WebCookieManagerPrivate -> NSHTTPCookieStorageInternal
    
            * AppController.m:
            (-[AppController deleteAllCookies]):
            * Preferences.subproj/AcceptedCookies.m:
            (compareByDomain):
            (compareByName):
            (compareByPath):
            (compareBySecure):
            (compareByExpires):
            (compareByContents):
            (-[AcceptedCookies updateCookieData]):
            (-[AcceptedCookies removeSelectedItems:]):
            (-[AcceptedCookies tableView:objectValueForTableColumn:row:]):
            (-[AcceptedCookies registerForCookieChangeNotifications]):
            * Preferences.subproj/SecurityPreferences.m:
            (-[SecurityPreferences takeCookiePolicyFrom:]):
            (-[SecurityPreferences updateCookiesViews]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4219 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ed4c1ae..96d89bb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,22 @@
 
         Reviewed by Darin
 
+        Changed cookie-related class names:
+
+        WebCookie -> NSHTTPCookie
+        WebCookiePrivate -> NSHTTPCookieInternal     
+        WebCookieManager -> NSHTTPCookieStorage      
+        WebCookieManagerPrivate -> NSHTTPCookieStorageInternal     
+
+        * WebCoreSupport.subproj/WebCookieAdapter.m:
+        (-[WebCookieAdapter cookiesEnabled]):
+        (-[WebCookieAdapter cookiesForURL:]):
+        (-[WebCookieAdapter setCookies:forURL:policyBaseURL:]):
+
+2003-04-30  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
         Changed file names for these classes. The contents
 	of the files themselves remain unchanged.
 
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index 4498379..1f8c8bc 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -26,7 +26,7 @@
 {
     BOOL result;
 
-    WebCookieAcceptPolicy acceptPolicy = [[WebCookieManager sharedCookieManager] acceptPolicy];
+    WebCookieAcceptPolicy acceptPolicy = [[NSHTTPCookieStorage sharedCookieManager] acceptPolicy];
     result = (acceptPolicy == WebCookieAcceptPolicyAlways || acceptPolicy == WebCookieAcceptPolicyOnlyFromMainDocumentDomain);
     
     return result;
@@ -34,12 +34,12 @@
 
 - (NSString *)cookiesForURL:(NSString *)URL
 {
-    return [[[WebCookieManager sharedCookieManager] cookieRequestHeaderFieldsForURL:[NSURL _web_URLWithString:URL]] objectForKey:@"Cookie"];
+    return [[[NSHTTPCookieStorage sharedCookieManager] cookieRequestHeaderFieldsForURL:[NSURL _web_URLWithString:URL]] objectForKey:@"Cookie"];
 }
 
 - (void)setCookies:(NSString *)cookies forURL:(NSString *)URL policyBaseURL:(NSString *)policyBaseURL
 {
-    [[WebCookieManager sharedCookieManager] setCookiesFromResponseHeader:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"]
+    [[NSHTTPCookieStorage sharedCookieManager] setCookiesFromResponseHeader:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"]
         forURL:[NSURL _web_URLWithString:URL] policyBaseURL:[NSURL _web_URLWithString:policyBaseURL]];    
 }
 

-- 
WebKit Debian packaging