[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:41:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0dbb7ad845c2601815b3a069d287d838a3f461e5
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 9 01:13:07 2003 +0000
2003-05-08 Ken Kocienda <kocienda at apple.com>
WebBrowser:
Reviewed by Maciej
A number of file and class name changes in WebFoundation, as done
by running this tops script.
replace "WebAboutProtocol" with "NSAboutURLProtocol"
replace "WebCFNetworkHTTPProtocol" with "NSCFNetworkHTTPURLProtocol"
replace "WebFileProtocol" with "NSFileURLProtocol"
replace "WebHTTPProtocol" with "NSHTTPURLProtocol"
replace "WebSimpleHTTPProtocol" with "NSSimpleHTTPURLProtocol"
replace "WebSSLProxyWrapperStream" with "NSSSLProxyWrapperStream"
There were also some changes I did by hand in DebugUtilities.m, to
bring up to date some flag names used to figure out what protocols are
registered.
* Debug/DebugUtilities.m:
(-[DebugUtilities supportedProtocolHandlersSubmenuItem]):
(-[BrowserDocument setCertificatePolicy:]):
(-[BrowserDocument validate_setCertificatePolicy:]):
(initProtocolHandlers):
(-[BrowserDocument unregisterAllProtocolHandlers]):
(-[BrowserDocument reregisterAllProtocolHandlers]):
(-[BrowserDocument toggleAboutURLProtocolHandler:]):
(-[BrowserDocument validate_toggleAboutURLProtocolHandler:]):
(-[BrowserDocument toggleFileURLProtocolHandler:]):
(-[BrowserDocument validate_toggleFileURLProtocolHandler:]):
(-[BrowserDocument toggleCFNetworkHTTPURLProtocolHandler:]):
(-[BrowserDocument validate_toggleCFNetworkHTTPURLProtocolHandler:]):
(-[BrowserDocument toggleSimpleHTTPURLProtocolHandler:]):
(-[BrowserDocument validate_toggleSimpleHTTPURLProtocolHandler:]):
WebFoundation:
A number of file and class name changes in WebFoundation, as done
by running this tops script.
/* Cookies */
replace "WebCookieStorage" with "NSHTTPCookieDOStorage"
replace "WebCookieStorageServer" with "NSHTTPCookieServer"
/* CacheLoader */
replace "WebNetworkSettings" with "NSNetworkSettings"
replace "WebNetworkSettingsPrivate" "NSNetworkSettingsPrivate"
replace "_settingsPrivate" "_internal"
replace "WebSynchronousDelegate" with "NSSynchronousURLConnectionDelegate"
/* Database */
replace "WebLRUFileList" with "NSLRUFileList"
/* Protocols */
replace "WebAboutProtocol" with "NSAboutURLProtocol"
replace "WebCFNetworkHTTPProtocol" with "NSCFNetworkHTTPURLProtocol"
replace "WebFileProtocol" with "NSFileURLProtocol"
replace "WebHTTPProtocol" with "NSHTTPURLProtocol"
replace "WebSimpleHTTPProtocol" with "NSSimpleHTTPURLProtocol"
replace "WebSSLProxyWrapperStream" with "NSSSLProxyWrapperStream"
Also, the NSLRUFileList files have many C functions whose names
changed from Web to NS prefixes.
* AuthenticationManager.subproj/NSHTTPAuthenticator.m:
(-[NSHTTPAuthenticator _proxyProtectionSpaceForURL:]):
* AuthenticationManager.subproj/NSURLCredentialStorage.m:
* CacheLoader.subproj/NSNetworkSettings.h:
* CacheLoader.subproj/NSNetworkSettings.m:
(-[NSNetworkSettings _updateProxySettings]):
(proxySettingsChanged):
(-[NSNetworkSettings _listenForProxySettingChanges]):
(-[NSNetworkSettings _URLMatchesProxyExceptions:]):
(-[NSNetworkSettings _init]):
(-[NSNetworkSettings init]):
(-[NSNetworkSettings dealloc]):
(initSharedNetworkSettings):
(+[NSNetworkSettings sharedNetworkSettings]):
(-[NSNetworkSettings proxyPropertiesForURL:]):
(-[NSNetworkSettings connectedToInternet:]):
* CacheLoader.subproj/NSSynchronousURLConnectionDelegate.h:
* CacheLoader.subproj/NSSynchronousURLConnectionDelegate.m:
* CacheLoader.subproj/NSURLCache.m:
(-[NSURLCacheInternal dealloc]):
(-[NSURLCache _diskCacheSync:]):
(-[NSURLCache _diskCacheCreateLRUList:]):
(-[NSURLCache _diskCacheGet:]):
(-[NSURLCache _diskCacheTruncate:]):
(-[NSURLCache _diskCacheExecuteWrite:]):
(-[NSURLCache _diskCacheExecuteRemoval:]):
* CacheLoader.subproj/NSURLConnection.m:
(+[NSURLConnection _forceSingleLoad]):
(_loadThrottler):
* CacheLoader.subproj/NSURLProtocol.m:
(NSURLProtocolInit):
* CacheLoader.subproj/WebNetworkSettings.h: Removed.
* CacheLoader.subproj/WebNetworkSettings.m: Removed.
* CacheLoader.subproj/WebSynchronousDelegate.h: Removed.
* CacheLoader.subproj/WebSynchronousDelegate.m: Removed.
* CookieManager.subproj/NSHTTPCookieDOStorage.h:
* CookieManager.subproj/NSHTTPCookieDOStorage.m:
(-[NSHTTPCookieDOStorage _updateCookiesFromServer]):
(-[NSHTTPCookieDOStorage _establishConnection]):
(-[NSHTTPCookieDOStorage init]):
* CookieManager.subproj/NSHTTPCookieServer.h:
* CookieManager.subproj/NSHTTPCookieServer.m:
(checkForCookieExpiration):
(-[NSHTTPCookieServer init]):
* CookieManager.subproj/NSHTTPCookieStorage.m:
(-[NSHTTPCookieStorage _connectToCookieStorage]):
* CookieManager.subproj/WebCookieStorage.h: Removed.
* CookieManager.subproj/WebCookieStorage.m: Removed.
* CookieManager.subproj/WebCookieStorageServer.h: Removed.
* CookieManager.subproj/WebCookieStorageServer.m: Removed.
* Database.subproj/NSLRUFileList.h:
* Database.subproj/NSLRUFileList.m:
(NSLRUFileListCreate):
(NSLRUFileListRelease):
(NSLRUFileListRebuildFileDataUsingRootDirectory):
(NSLRUFileListRemoveFileWithPath):
(NSLRUFileListTouchFileWithPath):
(NSLRUFileListSetFileData):
(NSLRUFileListGetPathOfOldestFile):
(NSLRUFileListRemoveOldestFileFromList):
(NSLRUFileListContainsItem):
(NSLRUFileListGetFileSize):
(NSLRUFileListCountItems):
(NSLRUFileListGetTotalSize):
(NSLRUFileListRemoveAllFilesFromList):
(compareTimes):
(NSLRUFileDataEqual):
(NSLRUFileListGetOldestFileData):
(NSLRUFileDataReleaseApplierFunction):
(NSLRUFileDataRelease):
(NSLRUFileDataBinaryHeapDumpApplierFunction):
(NSLRUFileDataDictDumpApplierFunction):
(NSLRUFileListDescription):
* Database.subproj/WebFileDatabase.h:
* Database.subproj/WebFileDatabase.m:
(-[WebFileDatabase _createLRUList:]):
(-[WebFileDatabase _truncateToSizeLimit:]):
(-[WebFileDatabase objectForKey:]):
(-[WebFileDatabase performSetObject:forKey:]):
(-[WebFileDatabase performRemoveObjectForKey:]):
(-[WebFileDatabase close]):
(-[WebFileDatabase lazySync:]):
(-[WebFileDatabase sync]):
(-[WebFileDatabase count]):
(-[WebFileDatabase usage]):
* Database.subproj/WebLRUFileList.h: Removed.
* Database.subproj/WebLRUFileList.m: Removed.
* English.lproj/StringsNotToBeLocalized.txt:
* ProtocolHandlers.subproj/NSAboutURLProtocol.h:
* ProtocolHandlers.subproj/NSAboutURLProtocol.m:
* ProtocolHandlers.subproj/NSCFNetworkHTTPURLProtocol.h:
* ProtocolHandlers.subproj/NSCFNetworkHTTPURLProtocol.m:
(NSCFNetworkHTTPURLProtocolInit):
(readStreamCallback):
(+[NSCFNetworkHTTPURLProtocol _certificatePolicy]):
(+[NSCFNetworkHTTPURLProtocol _setCertificatePolicy:]):
(+[NSCFNetworkHTTPURLProtocol _supportsCertificatePolicy:]):
(-[NSCFNetworkHTTPURLProtocol initWithRequest:cachedResponse:client:]):
(-[NSCFNetworkHTTPURLProtocol continueBeginLoadInBackgroundAfterCreatingHTTPRequest]):
* ProtocolHandlers.subproj/NSFTPURLProtocol.h:
* ProtocolHandlers.subproj/NSFTPURLProtocol.m:
(NSFTPURLProtocolInit):
(readStreamCallback):
(-[NSFTPURLProtocol initWithRequest:cachedResponse:client:]):
(-[NSFTPURLProtocol startLoading]):
(-[NSFTPURLProtocol determineErrorAndFail]):
* ProtocolHandlers.subproj/NSFileURLProtocol.h:
* ProtocolHandlers.subproj/NSFileURLProtocol.m:
* ProtocolHandlers.subproj/NSHTTPURLProtocol.h:
* ProtocolHandlers.subproj/NSHTTPURLProtocol.m:
(-[NSHTTPURLProtocol startOriginLoad]):
(-[NSHTTPURLProtocol stopLoading]):
(-[NSHTTPURLProtocol buildHTTPRequest]):
(-[NSHTTPURLProtocol determineErrorAndFail]):
(-[NSHTTPURLProtocol didAddCredentials:toRequest:context:]):
(-[NSHTTPURLProtocol cleanUpForRetry]):
* ProtocolHandlers.subproj/NSSSLProxyWrapperStream.h:
* ProtocolHandlers.subproj/NSSSLProxyWrapperStream.m:
(wSocketStreamCallBack):
(WebCFReadStreamOpenThroughSSLProxy):
(WebCFReadStreamCancelOpenThroughSSLProxy):
* ProtocolHandlers.subproj/NSSimpleHTTPURLProtocol.h:
* ProtocolHandlers.subproj/NSSimpleHTTPURLProtocol.m:
(ensureRequestStringCapacity):
(appendBytesToRequestString):
(appendIntegerToRequestString):
(appendNSStringToRequestString):
(NSSimpleHTTPURLProtocolInit):
(_socketWriteCallback):
(_socketReadCallback):
(_addCookieHeader):
(_hostNameResolved):
(+[NSSimpleHTTPURLProtocol canInitWithRequest:]):
(-[NSSimpleHTTPURLProtocol initWithRequest:cachedResponse:client:]):
* ProtocolHandlers.subproj/WebAboutProtocol.h: Removed.
* ProtocolHandlers.subproj/WebAboutProtocol.m: Removed.
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.h: Removed.
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m: Removed.
* ProtocolHandlers.subproj/WebFTPProtocol.h: Removed.
* ProtocolHandlers.subproj/WebFTPProtocol.m: Removed.
* ProtocolHandlers.subproj/WebFileProtocol.h: Removed.
* ProtocolHandlers.subproj/WebFileProtocol.m: Removed.
* ProtocolHandlers.subproj/WebHTTPProtocol.h: Removed.
* ProtocolHandlers.subproj/WebHTTPProtocol.m: Removed.
* ProtocolHandlers.subproj/WebSSLProxyWrapperStream.h: Removed.
* ProtocolHandlers.subproj/WebSSLProxyWrapperStream.m: Removed.
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.h: Removed.
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m: Removed.
* WebFoundation-base.exp:
* WebFoundation.pbproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4324 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Misc.subproj/WebFileDatabase.h b/WebKit/Misc.subproj/WebFileDatabase.h
index bb44400..3696692 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.h
+++ b/WebKit/Misc.subproj/WebFileDatabase.h
@@ -9,7 +9,7 @@
@interface WebFileDatabase : WebDatabase
{
- struct WebLRUFileList *lru;
+ struct NSLRUFileList *lru;
NSMutableArray *ops;
NSMutableDictionary *setCache;
NSMutableSet *removeCache;
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 35f5f04..3d0d8f7 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -14,7 +14,7 @@
#import <sys/mman.h>
#import "WebFoundationLogging.h"
-#import "WebLRUFileList.h"
+#import "NSLRUFileList.h"
#import "WebNSFileManagerExtras.h"
#import "WebSystemBits.h"
@@ -185,8 +185,8 @@ static void UniqueFilePathForKey(id key, char *buffer)
BEGIN_EXCEPTION_HANDLER
- WebLRUFileList *fileList = WebLRUFileListCreate();
- WebLRUFileListRebuildFileDataUsingRootDirectory(fileList, [path fileSystemRepresentation]);
+ NSLRUFileList *fileList = NSLRUFileListCreate();
+ NSLRUFileListRebuildFileDataUsingRootDirectory(fileList, [path fileSystemRepresentation]);
lru = fileList;
END_EXCEPTION_HANDLER
@@ -212,13 +212,13 @@ static void UniqueFilePathForKey(id key, char *buffer)
[mutex lock];
while ([self usage] > size) {
char uniqueKey[UniqueFilePathSize];
- if (!WebLRUFileListGetPathOfOldestFile(lru, uniqueKey, UniqueFilePathSize)) {
+ if (!NSLRUFileListGetPathOfOldestFile(lru, uniqueKey, UniqueFilePathSize)) {
break;
}
NSString *filePath = [[NSString alloc] initWithFormat:@"%@/%s", path, uniqueKey];
[defaultManager _web_removeFileOnlyAtPath:filePath];
[filePath release];
- WebLRUFileListRemoveOldestFileFromList(lru);
+ NSLRUFileListRemoveOldestFileFromList(lru);
}
[mutex unlock];
}
@@ -418,7 +418,7 @@ static void databaseInit()
if (lru) {
// if we can't update the list yet, that's too bad
// but not critically bad
- WebLRUFileListTouchFileWithPath(lru, uniqueKey);
+ NSLRUFileListTouchFileWithPath(lru, uniqueKey);
}
LOG(WebFileDatabaseActivity, "read disk cache file - %@", key);
}
@@ -479,13 +479,13 @@ static void databaseInit()
// update usage and truncate before writing file
// this has the effect of _always_ keeping disk usage under sizeLimit by clearing away space in anticipation of the write.
- WebLRUFileListSetFileData(lru, uniqueKey, [data length], CFAbsoluteTimeGetCurrent());
+ NSLRUFileListSetFileData(lru, uniqueKey, [data length], CFAbsoluteTimeGetCurrent());
[self _truncateToSizeLimit:[self sizeLimit]];
result = [defaultManager _web_createFileAtPathWithIntermediateDirectories:filePath contents:data attributes:attributes directoryAttributes:directoryAttributes];
if (!result) {
- WebLRUFileListRemoveFileWithPath(lru, uniqueKey);
+ NSLRUFileListRemoveFileWithPath(lru, uniqueKey);
}
[archiver release];
@@ -504,7 +504,7 @@ static void databaseInit()
UniqueFilePathForKey(key, uniqueKey);
filePath = [[NSString alloc] initWithFormat:@"%@/%s", path, uniqueKey];
[[NSFileManager defaultManager] _web_removeFileOnlyAtPath:filePath];
- WebLRUFileListRemoveFileWithPath(lru, uniqueKey);
+ NSLRUFileListRemoveFileWithPath(lru, uniqueKey);
[filePath release];
}
@@ -549,7 +549,7 @@ static void databaseInit()
if (isOpen) {
isOpen = NO;
if (lru) {
- WebLRUFileListRelease(lru);
+ NSLRUFileListRelease(lru);
lru = NULL;
}
}
@@ -566,7 +566,7 @@ static void databaseInit()
CFTimeInterval mark = CFAbsoluteTimeGetCurrent();
#endif
- LOG(WebFileDatabaseActivity, ">>> BEFORE lazySync\n%@", WebLRUFileListDescription(lru));
+ LOG(WebFileDatabaseActivity, ">>> BEFORE lazySync\n%@", NSLRUFileListDescription(lru));
WebFileDatabaseOp *op;
@@ -603,7 +603,7 @@ static void databaseInit()
#ifndef NDEBUG
if (lru)
- LOG(WebFileDatabaseActivity, "<<< AFTER lazySync\n%@", WebLRUFileListDescription(lru));
+ LOG(WebFileDatabaseActivity, "<<< AFTER lazySync\n%@", NSLRUFileListDescription(lru));
CFTimeInterval now = CFAbsoluteTimeGetCurrent();
LOG(WebFileDatabaseActivity, "lazySync ran in %.3f secs.", now - mark);
@@ -621,7 +621,7 @@ static void databaseInit()
touch = CFAbsoluteTimeGetCurrent();
- LOG(WebFileDatabaseActivity, ">>> BEFORE sync\n%@", WebLRUFileListDescription(lru));
+ LOG(WebFileDatabaseActivity, ">>> BEFORE sync\n%@", NSLRUFileListDescription(lru));
[mutex lock];
array = [ops copy];
@@ -636,13 +636,13 @@ static void databaseInit()
[array makeObjectsPerformSelector:@selector(perform:) withObject:self];
[array release];
- LOG(WebFileDatabaseActivity, "<<< AFTER sync\n%@", WebLRUFileListDescription(lru));
+ LOG(WebFileDatabaseActivity, "<<< AFTER sync\n%@", NSLRUFileListDescription(lru));
}
-(unsigned)count
{
if (lru)
- return WebLRUFileListCountItems(lru);
+ return NSLRUFileListCountItems(lru);
return 0;
}
@@ -650,7 +650,7 @@ static void databaseInit()
-(unsigned)usage
{
if (lru)
- return WebLRUFileListGetTotalSize(lru);
+ return NSLRUFileListGetTotalSize(lru);
return 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list