[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:42:15 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 76f7d42805c7c24e26cc620bfb1ce5482fbf0bda
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 14 21:03:27 2003 +0000
Tests:
Reviewed by David
File and class renamings in WebFoundation:
WebKeyValuePair -> NSURLKeyValuePair
WebReadWriteLock -> NSURLReadWriteLock
WebRecursiveReadWriteLock -> NSURLRecursiveReadWriteLock
* WebFoundation-Misc/ifnsstringextensions-test.m:
(formatPair):
(main):
* WebFoundation-Misc/ifreadwritelock-test.m:
(main):
* WebFoundation-Misc/ifrecursivereadwritelock-test.m:
(main):
WebFoundation:
Reviewed by David
File and class renamings:
WebFileTypeMappings -> NSURLFileTypeMappings
WebHostNameAddressInfo.h -> NSURLHostNameAddressInfo.h
WebKeyValuePair -> NSURLKeyValuePair
WebMonitor -> NSURLMonitor
WebQueue -> NSURLQueue
WebReadWriteLock -> NSURLReadWriteLock
WebRecursiveReadWriteLock -> NSURLRecursiveReadWriteLock
WebSpinLock -> NSURLSpinLock
* AuthenticationManager.subproj/NSHTTPAuthenticator.h:
* AuthenticationManager.subproj/NSHTTPAuthenticator.m:
(-[NSHTTPAuthenticator _internalInit]):
* AuthenticationManager.subproj/NSURLCredentialStorage.m:
* CacheLoader.subproj/NSNetworkSettings.m:
(-[NSNetworkSettingsInternal init]):
* CacheLoader.subproj/NSSynchronousURLConnectionDelegate.h:
* CacheLoader.subproj/NSSynchronousURLConnectionDelegate.m:
(-[NSSynchronousURLConnectionDelegate initWithRequest:monitor:]):
* CacheLoader.subproj/NSURLCache.m:
(-[NSURLCache initWithMemoryCapacity:diskCapacity:diskPath:]):
* CacheLoader.subproj/NSURLConnection.m:
(NSURLConnectionInit):
* CacheLoader.subproj/NSURLConnectionQueue.h:
* CacheLoader.subproj/NSURLConnectionQueue.m:
(-[NSURLConnectionQueue put:URL:]):
* CacheLoader.subproj/NSURLResponse.m:
(-[NSHTTPURLResponse _parseCacheControl]):
* ChangeLog:
* CookieManager.subproj/NSHTTPCookie.m:
(+[NSHTTPCookie cookieWithV0Spec:forURL:locationHeader:]):
* CookieManager.subproj/NSHTTPCookieStorage.m:
(-[NSHTTPCookieStorageInternal init]):
* English.lproj/StringsNotToBeLocalized.txt:
* Misc.subproj/NSURLFileTypeMappings.h:
* Misc.subproj/NSURLFileTypeMappings.m:
(-[NSURLFileTypeMappings _init]):
(initFileTypeMappings):
(+[NSURLFileTypeMappings sharedMappings]):
* Misc.subproj/NSURLHostNameAddressInfo.h:
* Misc.subproj/NSURLHostNameAddressInfo.m:
(NSURLHostNameAddressInfoInit):
(+[NSURLHostNameAddressInfo addressInfoForHost:]):
(+[NSURLHostNameAddressInfo asyncResolveWithCallbackClient:]):
(doResolveHostName):
(resolveHostName):
* Misc.subproj/NSURLKeyValuePair.h:
* Misc.subproj/NSURLKeyValuePair.m:
(+[NSURLKeyValuePair pair]):
(+[NSURLKeyValuePair pairWithKey:value:]):
(-[NSURLKeyValuePair description]):
* Misc.subproj/NSURLMonitor.h:
* Misc.subproj/NSURLMonitor.m:
* Misc.subproj/NSURLQueue.h:
* Misc.subproj/NSURLQueue.m:
(+[NSURLQueue newNode]):
(-[NSURLQueue init]):
(-[NSURLQueue put:]):
(-[NSURLQueue take]):
(-[NSURLQueue peekAt:]):
(-[NSURLQueue remove:]):
(-[NSURLQueue clear]):
(-[NSURLQueue indexOf:]):
* Misc.subproj/NSURLReadWriteLock.h:
* Misc.subproj/NSURLReadWriteLock.m:
(-[NSURLReadWriteLock init]):
* Misc.subproj/NSURLRecursiveReadWriteLock.h:
* Misc.subproj/NSURLRecursiveReadWriteLock.m:
* Misc.subproj/NSURLSpinLock.h:
* Misc.subproj/NSURLSpinLock.m:
* Misc.subproj/WebFileTypeMappings.h: Removed.
* Misc.subproj/WebFileTypeMappings.m: Removed.
* Misc.subproj/WebHostNameAddressInfo.h: Removed.
* Misc.subproj/WebHostNameAddressInfo.m: Removed.
* Misc.subproj/WebKeyValuePair.h: Removed.
* Misc.subproj/WebKeyValuePair.m: Removed.
* Misc.subproj/WebMonitor.h: Removed.
* Misc.subproj/WebMonitor.m: Removed.
* Misc.subproj/WebNSArrayExtras.m:
(-[NSArray _web_encodeWWWFormURLData]):
* Misc.subproj/WebNSDataExtras.m:
(-[NSData _web_guessedMIMETypeForExtension:]):
* Misc.subproj/WebNSStringExtras.h:
* Misc.subproj/WebNSStringExtras.m:
(-[NSString _web_parseAsKeyValuePair]):
(-[NSString _web_parseAsKeyValuePairHandleQuotes:]):
(-[NSString _web_fileNameFromContentDispositionHeader]):
(-[NSString _web_timeoutFromKeepAliveHeader]):
* Misc.subproj/WebNSURLExtras.m:
(-[NSURL _web_suggestedFilenameWithMIMEType:]):
* Misc.subproj/WebQueue.h: Removed.
* Misc.subproj/WebQueue.m: Removed.
* Misc.subproj/WebReadWriteLock.h: Removed.
* Misc.subproj/WebReadWriteLock.m: Removed.
* Misc.subproj/WebRecursiveReadWriteLock.h: Removed.
* Misc.subproj/WebRecursiveReadWriteLock.m: Removed.
* Misc.subproj/WebSpinLock.h: Removed.
* Misc.subproj/WebSpinLock.m: Removed.
* ProtocolHandlers.subproj/NSCFNetworkHTTPURLProtocol.m:
* ProtocolHandlers.subproj/NSFTPURLProtocol.m:
(-[NSFTPURLProtocol sendResponseAvailableCallback]):
* ProtocolHandlers.subproj/NSFileURLProtocol.m:
(-[NSFileURLProtocol didLoadData:]):
* ProtocolHandlers.subproj/NSHTTPURLProtocol.m:
* ProtocolHandlers.subproj/NSSimpleHTTPURLProtocol.h:
* ProtocolHandlers.subproj/NSSimpleHTTPURLProtocol.m:
(NSSimpleHTTPURLProtocolInit):
(-[NSSimpleHTTPURLProtocol initWithRequest:cachedResponse:client:]):
(-[NSSimpleHTTPURLProtocol startOriginLoad]):
(-[NSSimpleHTTPURLProtocol hostNameResolved:]):
(-[NSSimpleHTTPURLProtocol _handleLoadCallback]):
* WebFoundation-base.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by David
File and class renaming in WebFoundation:
WebFileTypeMappings -> NSURLFileTypeMappings
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge MIMETypeForPath:]):
* WebCoreSupport.subproj/WebImageRendererFactory.m:
(-[WebImageRendererFactory supportedMIMETypes]):
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebMainResourceClient.m:
* WebView.subproj/WebViewPrivate.m:
(+[WebView suggestedFileExtensionForMIMEType:]):
(+[WebView _MIMETypeForFile:]):
WebBrowser:
Reviewed by David
File and class renaming done in WebFoundation:
WebFileTypeMappings -> NSURLFileTypeMappings
* BrowserWebController.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4375 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3218e88..da02735 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,23 @@
2003-05-14 Ken Kocienda <kocienda at apple.com>
+ Reviewed by David
+
+ File and class renaming in WebFoundation:
+
+ WebFileTypeMappings -> NSURLFileTypeMappings
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge MIMETypeForPath:]):
+ * WebCoreSupport.subproj/WebImageRendererFactory.m:
+ (-[WebImageRendererFactory supportedMIMETypes]):
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebViewPrivate.m:
+ (+[WebView suggestedFileExtensionForMIMEType:]):
+ (+[WebView _MIMETypeForFile:]):
+
+2003-05-14 Ken Kocienda <kocienda at apple.com>
+
Reviewed by Maciej
Copied WebLocalizableStrings.[hm] from WebFoundation to WebKit
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 6dad771..2681102 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -48,7 +48,7 @@
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebSystemBits.h>
-#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/NSURLFileTypeMappings.h>
#import <WebKit/WebLocalizableStrings.h>
@@ -805,7 +805,7 @@ static BOOL loggedObjectCacheSize = NO;
{
ASSERT(path);
NSString *extension = [path pathExtension];
- return [[WebFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
+ return [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
}
- (void)handleMouseDragged:(NSEvent *)event
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
index 32f6f74..06f3118 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
@@ -27,7 +27,7 @@
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/NSURLFileTypeMappings.h>
@implementation WebImageRendererFactory
@@ -110,7 +110,7 @@
nil];
NSEnumerator *enumerator = [[NSImage imageFileTypes] objectEnumerator];
- WebFileTypeMappings *mappings = [WebFileTypeMappings sharedMappings];
+ NSURLFileTypeMappings *mappings = [NSURLFileTypeMappings sharedMappings];
NSMutableSet *mimes = [NSMutableSet set];
NSString *type;
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 902ef2b..d4181bd 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -15,7 +15,7 @@
#import <WebKit/WebView.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/NSURLFileTypeMappings.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLResponse.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 03ea6f4..ddeb5bc 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -8,7 +8,7 @@
#import <WebFoundation/NSHTTPCookie.h>
#import <WebFoundation/WebNSErrorExtras.h>
-#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/NSURLFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLConnectionPrivate.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 03ea6f4..ddeb5bc 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -8,7 +8,7 @@
#import <WebFoundation/NSHTTPCookie.h>
#import <WebFoundation/WebNSErrorExtras.h>
-#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/NSURLFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLConnectionPrivate.h>
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 5b12c9e..c3b93ac 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -25,7 +25,7 @@
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/NSURLFileTypeMappings.h>
#import <WebFoundation/WebNSDataExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/NSURLConnection.h>
@@ -88,7 +88,7 @@ static NSMutableSet *schemesWithRepresentationsSet;
+ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)type
{
- return [[WebFileTypeMappings sharedMappings] preferredExtensionForMIMEType:type];
+ return [[NSURLFileTypeMappings sharedMappings] preferredExtensionForMIMEType:type];
}
- (void)_close
@@ -193,7 +193,7 @@ static NSMutableSet *schemesWithRepresentationsSet;
// Get the MIME type from the extension.
if ([extension length] != 0) {
- MIMEType = [[WebFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
+ MIMEType = [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
}
// If we can't get a known MIME type from the extension, sniff.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list