[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:36:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b0badeacc8cfaca3f43e9c29631857344e9a0e88
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 5 00:02:43 2002 +0000
WebKit:
Made the icon DB take a a path for built-in icons so that we only load them when necessary.
* Misc.subproj/WebIconDatabase.m:
(-[WebIconDatabase init]):
(-[WebIconDatabase iconForSiteURL:withSize:]):
(-[WebIconDatabase _hasIconForSiteURL:]):
(-[WebIconDatabase _builtInIconsForHost:]):
(-[WebIconDatabase _setBuiltInIconAtPath:forHost:]):
* Misc.subproj/WebIconDatabasePrivate.h:
* WebKit.pbproj/project.pbxproj:
WebBrowser:
Added the built-in site icons to the Alexander.app package.
* AppController.m:
(-[AppController _installBuiltInIcons]):
* Resources/SiteIcons/Icons.plist: Added.
* Resources/SiteIcons/amazon.tiff: Added.
* Resources/SiteIcons/apple.tiff: Added.
* Resources/SiteIcons/cnet.tiff: Added.
* Resources/SiteIcons/cnn.tiff: Added.
* Resources/SiteIcons/ebay.tiff: Added.
* Resources/SiteIcons/espn.tiff: Added.
* Resources/SiteIcons/msn.tiff: Added.
* Resources/SiteIcons/nyt.tiff: Added.
* Resources/SiteIcons/pbskids.tiff: Added.
* Resources/SiteIcons/yahoo.tiff: Added.
* WebBrowser.pbproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1963 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d61a93b..dd8d638 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-09-04 Chris Blumenberg <cblu at apple.com>
+
+ Made the icon DB take a a path for built-in icons so that we only load them when necessary.
+
+ * Misc.subproj/WebIconDatabase.m:
+ (-[WebIconDatabase init]):
+ (-[WebIconDatabase iconForSiteURL:withSize:]):
+ (-[WebIconDatabase _hasIconForSiteURL:]):
+ (-[WebIconDatabase _builtInIconsForHost:]):
+ (-[WebIconDatabase _setBuiltInIconAtPath:forHost:]):
+ * Misc.subproj/WebIconDatabasePrivate.h:
+ * WebKit.pbproj/project.pbxproj:
+
2002-09-04 Darin Adler <darin at apple.com>
Fix unused variable warnings for deployment builds.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d61a93b..dd8d638 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-09-04 Chris Blumenberg <cblu at apple.com>
+
+ Made the icon DB take a a path for built-in icons so that we only load them when necessary.
+
+ * Misc.subproj/WebIconDatabase.m:
+ (-[WebIconDatabase init]):
+ (-[WebIconDatabase iconForSiteURL:withSize:]):
+ (-[WebIconDatabase _hasIconForSiteURL:]):
+ (-[WebIconDatabase _builtInIconsForHost:]):
+ (-[WebIconDatabase _setBuiltInIconAtPath:forHost:]):
+ * Misc.subproj/WebIconDatabasePrivate.h:
+ * WebKit.pbproj/project.pbxproj:
+
2002-09-04 Darin Adler <darin at apple.com>
Fix unused variable warnings for deployment builds.
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 9a0f25e..926744d 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -34,7 +34,7 @@ NSSize WebIconMediumSize = {32, 32};
- (void)_updateFileDatabase;
- (NSMutableArray *)_iconsForIconURL:(NSURL *)iconURL;
- (NSImage *)_iconForFileURL:(NSURL *)fileURL withSize:(NSSize)size;
-- (NSMutableArray *)_builtItIconsForHost:(NSString *)host;
+- (NSMutableArray *)_builtInIconsForHost:(NSString *)host;
- (void)_retainIconForIconURL:(NSURL *)iconURL;
- (void)_releaseIconForIconURL:(NSURL *)iconURL;
- (void)_retainFutureIconForSiteURL:(NSURL *)siteURL;
@@ -74,7 +74,8 @@ NSSize WebIconMediumSize = {32, 32};
_private->iconURLToIcons = [[NSMutableDictionary dictionary] retain];
_private->iconURLToRetainCount = [[NSMutableDictionary dictionary] retain];
_private->futureSiteURLToRetainCount = [[NSMutableDictionary dictionary] retain];
- _private->hostToBuiltItIcons = [[NSMutableDictionary dictionary] retain];
+ _private->hostToBuiltInIcons = [[NSMutableDictionary dictionary] retain];
+ _private->hostToBuiltInIconPath = [[NSMutableDictionary dictionary] retain];
_private->iconsToEraseWithURLs = [[NSMutableSet set] retain];
_private->iconsToSaveWithURLs = [[NSMutableSet set] retain];
@@ -103,7 +104,7 @@ NSSize WebIconMediumSize = {32, 32};
return [self _iconForFileURL:siteURL withSize:size];
}
- NSMutableArray *icons = [self _builtItIconsForHost:[siteURL host]];
+ NSMutableArray *icons = [self _builtInIconsForHost:[siteURL host]];
if(!icons){
NSURL *iconURL = [_private->siteURLToIconURL objectForKey:siteURL];
@@ -327,7 +328,7 @@ NSSize WebIconMediumSize = {32, 32};
{
if([siteURL isFileURL]){
return YES;
- }else if([self _builtItIconsForHost:[siteURL host]]){
+ }else if([_private->hostToBuiltInIconPath objectForKey:[siteURL host]]){
return YES;
}else if([_private->siteURLToIconURL objectForKey:siteURL]){
return YES;
@@ -395,13 +396,14 @@ NSSize WebIconMediumSize = {32, 32};
}
}
-- (NSMutableArray *)_builtItIconsForHost:(NSString *)host
+- (NSMutableArray *)_builtInIconsForHost:(NSString *)host
{
NSArray *hostParts = [host componentsSeparatedByString:@"."];
NSMutableString *truncatedHost = [NSMutableString string];
+ NSString *hostPart, *path;
NSMutableArray *icons;
BOOL firstPart = YES;
- NSString *hostPart;
+ NSImage *icon;
NSEnumerator *enumerator = [hostParts reverseObjectEnumerator];
while ((hostPart = [enumerator nextObject]) != nil) {
@@ -410,9 +412,20 @@ NSSize WebIconMediumSize = {32, 32};
firstPart = NO;
}else{
[truncatedHost insertString:[NSString stringWithFormat:@"%@.", hostPart] atIndex:0];
- icons = [_private->hostToBuiltItIcons objectForKey:truncatedHost];
- if(icons){
- return icons;
+ path = [_private->hostToBuiltInIconPath objectForKey:truncatedHost];
+ if(path){
+ icons = [_private->hostToBuiltInIcons objectForKey:truncatedHost];
+ if(!icons){
+ icon = [[NSImage alloc] initWithContentsOfFile:path];
+ if(icon){
+ icons = [NSMutableArray arrayWithObject:icon];
+ [_private->hostToBuiltInIcons setObject:icons forKey:host];
+ [icon release];
+ }
+ }
+ if(icons){
+ return icons;
+ }
}
}
}
@@ -470,16 +483,16 @@ NSSize WebIconMediumSize = {32, 32};
[self _updateFileDatabase];
}
-- (void)_setBuiltInIcon:(NSImage *)icon forHost:(NSString *)host
+- (void)_setBuiltInIconAtPath:(NSString *)path forHost:(NSString *)host
{
- if(!icon || !host){
+ if(!path || !host){
return;
}
+
+ [_private->hostToBuiltInIconPath setObject:path forKey:host];
NSMutableSet *siteURLs = [_private->hostToSiteURLs objectForKey:host];
NSURL *siteURL;
-
- [_private->hostToBuiltItIcons setObject:[NSMutableArray arrayWithObject:icon] forKey:host];
if(siteURLs){
NSEnumerator *enumerator = [siteURLs objectEnumerator];
diff --git a/WebKit/Misc.subproj/WebIconDatabasePrivate.h b/WebKit/Misc.subproj/WebIconDatabasePrivate.h
index 528afba..9dc84b6 100644
--- a/WebKit/Misc.subproj/WebIconDatabasePrivate.h
+++ b/WebKit/Misc.subproj/WebIconDatabasePrivate.h
@@ -22,7 +22,8 @@
NSMutableDictionary *siteURLToIconURL;
NSMutableDictionary *futureSiteURLToRetainCount;
NSMutableDictionary *hostToSiteURLs;
- NSMutableDictionary *hostToBuiltItIcons;
+ NSMutableDictionary *hostToBuiltInIcons;
+ NSMutableDictionary *hostToBuiltInIconPath;
NSMutableSet *iconsOnDiskWithURLs;
NSMutableSet *iconsToEraseWithURLs;
@@ -50,7 +51,7 @@
// Called by WebDataSource to bind a web site URL to a icon URL and icon image.
- (void)_setIconURL:(NSURL *)iconURL forSiteURL:(NSURL *)siteURL;
-- (void)_setBuiltInIcon:(NSImage *)icon forHost:(NSString *)host;
+- (void)_setBuiltInIconAtPath:(NSString *)path forHost:(NSString *)host;
- (BOOL)_hasIconForSiteURL:(NSURL *)siteURL;
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index caed43e..c01cc74 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,7 +72,6 @@
F58C8A07025BD3BC018635CA,
F531DDFF02F0C36F018635CA,
);
- hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list