[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 05:58:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1ce0e5c97fbe8af1e66bccf653353be99ab99b1a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 21 22:02:44 2002 +0000
2002-03-21 Kenneth Kocienda <kocienda at apple.com>
Fixed an issue with the disk cache taking too long to empty. Now, the disk cache
is emptied on a background thread.
* Database.subproj/IFURLFileDatabase.h:
* Database.subproj/IFURLFileDatabase.m: (-[IFURLFileDatabase removeAllObjects]):
* Misc.subproj/IFNSFileManagerExtensions.h:
* Misc.subproj/IFNSFileManagerExtensions.m: (-[NSFileManager
performRemoveFileAtPath:]), (-[NSFileManager backgroundRemoveFileAtPath:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@794 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Misc.subproj/WebFileDatabase.h b/WebKit/Misc.subproj/WebFileDatabase.h
index bedcf77..71dc223 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.h
+++ b/WebKit/Misc.subproj/WebFileDatabase.h
@@ -8,4 +8,7 @@
@interface IFURLFileDatabase : IFDatabase
+{
+ NSLock *mutex;
+}
@end
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index d40bd88..b9be7d0 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -128,9 +128,11 @@ static NSNumber *IFURLFilePosixPermissions;
-(void)removeAllObjects
{
+ [mutex lock];
[self close];
- [[NSFileManager defaultManager] removeFileAtPath:path handler:nil];
+ [[NSFileManager defaultManager] backgroundRemoveFileAtPath:path];
[self open];
+ [mutex unlock];
}
-(id)objectForKey:(id)key
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list